Skip to content

Commit fd8a67f

Browse files
hsbtk0kubun
authored andcommitted
Re-ordered vcpkg related steps. It may be affected with VsDevCmd.bat
1 parent 942d64b commit fd8a67f

File tree

1 file changed

+19
-18
lines changed

1 file changed

+19
-18
lines changed

.github/workflows/windows.yml

Lines changed: 19 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -95,13 +95,6 @@ jobs:
9595
windows-toolchain: none
9696
if: ${{ matrix.os != '2025' }}
9797

98-
- name: Install libraries with scoop
99-
run: |
100-
iex "& {$(irm get.scoop.sh)} -RunAsAdmin"
101-
Join-Path (Resolve-Path ~).Path "scoop\shims" >> $Env:GITHUB_PATH
102-
scoop install vcpkg [email protected]
103-
shell: pwsh
104-
10598
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
10699
with:
107100
sparse-checkout-cone-mode: false
@@ -112,6 +105,25 @@ jobs:
112105
srcdir: src
113106
builddir: build
114107

108+
- name: Install tools with scoop
109+
run: |
110+
iex "& {$(irm get.scoop.sh)} -RunAsAdmin"
111+
Join-Path (Resolve-Path ~).Path "scoop\shims" >> $Env:GITHUB_PATH
112+
scoop install vcpkg [email protected]
113+
shell: pwsh
114+
115+
# vcpkg built-in cache is not working now
116+
- name: Restore vcpkg artifact
117+
uses: actions/cache@5a3ec84eff668545956fd18022155c47e93e2684 # v4.2.3
118+
with:
119+
path: src\vcpkg_installed
120+
key: windows-${{ matrix.os }}-vcpkg-${{ hashFiles('src/vcpkg.json') }}
121+
122+
- name: Install libraries with vcpkg
123+
run: |
124+
vcpkg install --vcpkg-root=C:\Users\runneradmin\scoop\apps\vcpkg\current
125+
working-directory: src
126+
115127
- name: setup env
116128
# Available Ruby versions: https://github.com/actions/runner-images/blob/main/images/windows/Windows2019-Readme.md#ruby
117129
# %TEMP% is inconsistent with %TMP% and test-all expects they are consistent.
@@ -145,17 +157,6 @@ jobs:
145157
run: Get-Volume
146158
shell: pwsh
147159

148-
- name: Restore vcpkg artifact
149-
uses: actions/cache@5a3ec84eff668545956fd18022155c47e93e2684 # v4.2.3
150-
with:
151-
path: ${{ github.workspace }}/src/vcpkg_installed
152-
key: windows-${{ matrix.os }}-vcpkg-${{ hashFiles('src/vcpkg.json') }}
153-
154-
- name: Install libraries with vcpkg
155-
run: |
156-
vcpkg install --vcpkg-root=C:\Users\runneradmin\scoop\apps\vcpkg\current
157-
working-directory: src
158-
159160
# TODO: We should use `../src` instead of `D:/a/ruby/ruby/src`
160161
- name: Configure
161162
run: >-

0 commit comments

Comments
 (0)