Skip to content

Commit 62b1ae0

Browse files
committed
Win: Slim down vcvars_ver options in the matrix
1 parent 772fc1f commit 62b1ae0

File tree

1 file changed

+6
-4
lines changed

1 file changed

+6
-4
lines changed

.github/workflows/windows.yml

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -27,18 +27,18 @@ jobs:
2727
include:
2828
- os: 2022
2929
vc: 2019
30-
vcvars: '-vcvars_ver=14.2' # VS 2022 17.13.x is broken at windows-2022
30+
vcvars: '14.2' # VS 2022 17.13.x is broken at windows-2022
3131
test_task: check
3232
- os: 2025
3333
vc: 2019
34-
vcvars: '-vcvars_ver=14.2'
34+
vcvars: '14.2'
3535
test_task: check
3636
- os: 11-arm
3737
test_task: 'btest test-basic test-tool' # check and test-spec are broken yet.
3838
target: arm64
3939
- os: 2022
4040
vc: 2019
41-
vcvars: '-vcvars_ver=14.2'
41+
vcvars: '14.2'
4242
test_task: test-bundled-gems
4343
fail-fast: false
4444

@@ -96,7 +96,9 @@ jobs:
9696
run: |
9797
::- Set up VC ${{ matrix.vc }}
9898
set | uutils sort > old.env
99-
call ..\src\win32\vssetup.cmd -arch=${{ matrix.target || 'amd64' }} ${{ matrix.vcvars || '' }}
99+
call ..\src\win32\vssetup.cmd ^
100+
-arch=${{ matrix.target || 'amd64' }} ^
101+
${{ matrix.vcvars && '-vcvars_ver=' || '' }}${{ matrix.vcvars }}
100102
nmake -f nul
101103
set TMP=%USERPROFILE%\AppData\Local\Temp
102104
set TEMP=%USERPROFILE%\AppData\Local\Temp

0 commit comments

Comments
 (0)