mirror of
https://github.com/ruby/ruby.git
synced 2025-08-15 13:39:04 +02:00
Re-ordered vcpkg related steps. It may be affected with VsDevCmd.bat
This commit is contained in:
parent
80bf0744a0
commit
5aaedc052c
1 changed files with 20 additions and 20 deletions
40
.github/workflows/windows.yml
vendored
40
.github/workflows/windows.yml
vendored
|
@ -68,14 +68,6 @@ jobs:
|
|||
bundler: none
|
||||
windows-toolchain: none
|
||||
|
||||
- name: Install tools with scoop
|
||||
run: |
|
||||
Set-ExecutionPolicy -ExecutionPolicy RemoteSigned -Scope CurrentUser
|
||||
iwr -useb get.scoop.sh | iex
|
||||
Join-Path (Resolve-Path ~).Path "scoop\shims" >> $Env:GITHUB_PATH
|
||||
scoop install vcpkg uutils-coreutils cmake@3.31.6
|
||||
shell: pwsh
|
||||
|
||||
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
|
||||
with:
|
||||
sparse-checkout-cone-mode: false
|
||||
|
@ -86,6 +78,26 @@ jobs:
|
|||
srcdir: src
|
||||
builddir: build
|
||||
|
||||
- name: Install tools with scoop
|
||||
run: |
|
||||
Set-ExecutionPolicy -ExecutionPolicy RemoteSigned -Scope CurrentUser
|
||||
iwr -useb get.scoop.sh | iex
|
||||
Join-Path (Resolve-Path ~).Path "scoop\shims" >> $Env:GITHUB_PATH
|
||||
scoop install vcpkg uutils-coreutils 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.
|
||||
|
@ -116,18 +128,6 @@ jobs:
|
|||
run: Get-Volume
|
||||
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
|
||||
|
||||
# TODO: We should use `../src` instead of `D:/a/ruby/ruby/src`
|
||||
- name: Configure
|
||||
run: >-
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue