mirror of
https://github.com/ruby/ruby.git
synced 2026-01-27 04:24:23 +00:00
Re-ordered vcpkg related steps. It may be affected with VsDevCmd.bat
This commit is contained in:
parent
942d64b428
commit
fd8a67fc8c
37
.github/workflows/windows.yml
vendored
37
.github/workflows/windows.yml
vendored
@ -95,13 +95,6 @@ jobs:
|
||||
windows-toolchain: none
|
||||
if: ${{ matrix.os != '2025' }}
|
||||
|
||||
- name: Install libraries with scoop
|
||||
run: |
|
||||
iex "& {$(irm get.scoop.sh)} -RunAsAdmin"
|
||||
Join-Path (Resolve-Path ~).Path "scoop\shims" >> $Env:GITHUB_PATH
|
||||
scoop install vcpkg cmake@3.31.6
|
||||
shell: pwsh
|
||||
|
||||
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
|
||||
with:
|
||||
sparse-checkout-cone-mode: false
|
||||
@ -112,6 +105,25 @@ jobs:
|
||||
srcdir: src
|
||||
builddir: build
|
||||
|
||||
- name: Install tools with scoop
|
||||
run: |
|
||||
iex "& {$(irm get.scoop.sh)} -RunAsAdmin"
|
||||
Join-Path (Resolve-Path ~).Path "scoop\shims" >> $Env:GITHUB_PATH
|
||||
scoop install vcpkg cmake@3.31.6
|
||||
shell: pwsh
|
||||
|
||||
# vcpkg built-in cache is not working now
|
||||
- name: Restore vcpkg artifact
|
||||
uses: actions/cache@5a3ec84eff668545956fd18022155c47e93e2684 # v4.2.3
|
||||
with:
|
||||
path: src\vcpkg_installed
|
||||
key: windows-${{ matrix.os }}-vcpkg-${{ hashFiles('src/vcpkg.json') }}
|
||||
|
||||
- name: Install libraries with vcpkg
|
||||
run: |
|
||||
vcpkg install --vcpkg-root=C:\Users\runneradmin\scoop\apps\vcpkg\current
|
||||
working-directory: src
|
||||
|
||||
- name: setup env
|
||||
# Available Ruby versions: https://github.com/actions/runner-images/blob/main/images/windows/Windows2019-Readme.md#ruby
|
||||
# %TEMP% is inconsistent with %TMP% and test-all expects they are consistent.
|
||||
@ -145,17 +157,6 @@ jobs:
|
||||
run: Get-Volume
|
||||
shell: pwsh
|
||||
|
||||
- name: Restore vcpkg artifact
|
||||
uses: actions/cache@5a3ec84eff668545956fd18022155c47e93e2684 # v4.2.3
|
||||
with:
|
||||
path: ${{ github.workspace }}/src/vcpkg_installed
|
||||
key: windows-${{ matrix.os }}-vcpkg-${{ hashFiles('src/vcpkg.json') }}
|
||||
|
||||
- name: Install libraries with vcpkg
|
||||
run: |
|
||||
vcpkg install --vcpkg-root=C:\Users\runneradmin\scoop\apps\vcpkg\current
|
||||
working-directory: src
|
||||
|
||||
# TODO: We should use `../src` instead of `D:/a/ruby/ruby/src`
|
||||
- name: Configure
|
||||
run: >-
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user