Win: Slim down vcvars_ver
options in the matrix
This commit is contained in:
parent
772fc1f187
commit
62b1ae0905
10
.github/workflows/windows.yml
vendored
10
.github/workflows/windows.yml
vendored
@ -27,18 +27,18 @@ jobs:
|
|||||||
include:
|
include:
|
||||||
- os: 2022
|
- os: 2022
|
||||||
vc: 2019
|
vc: 2019
|
||||||
vcvars: '-vcvars_ver=14.2' # VS 2022 17.13.x is broken at windows-2022
|
vcvars: '14.2' # VS 2022 17.13.x is broken at windows-2022
|
||||||
test_task: check
|
test_task: check
|
||||||
- os: 2025
|
- os: 2025
|
||||||
vc: 2019
|
vc: 2019
|
||||||
vcvars: '-vcvars_ver=14.2'
|
vcvars: '14.2'
|
||||||
test_task: check
|
test_task: check
|
||||||
- os: 11-arm
|
- os: 11-arm
|
||||||
test_task: 'btest test-basic test-tool' # check and test-spec are broken yet.
|
test_task: 'btest test-basic test-tool' # check and test-spec are broken yet.
|
||||||
target: arm64
|
target: arm64
|
||||||
- os: 2022
|
- os: 2022
|
||||||
vc: 2019
|
vc: 2019
|
||||||
vcvars: '-vcvars_ver=14.2'
|
vcvars: '14.2'
|
||||||
test_task: test-bundled-gems
|
test_task: test-bundled-gems
|
||||||
fail-fast: false
|
fail-fast: false
|
||||||
|
|
||||||
@ -96,7 +96,9 @@ jobs:
|
|||||||
run: |
|
run: |
|
||||||
::- Set up VC ${{ matrix.vc }}
|
::- Set up VC ${{ matrix.vc }}
|
||||||
set | uutils sort > old.env
|
set | uutils sort > old.env
|
||||||
call ..\src\win32\vssetup.cmd -arch=${{ matrix.target || 'amd64' }} ${{ matrix.vcvars || '' }}
|
call ..\src\win32\vssetup.cmd ^
|
||||||
|
-arch=${{ matrix.target || 'amd64' }} ^
|
||||||
|
${{ matrix.vcvars && '-vcvars_ver=' || '' }}${{ matrix.vcvars }}
|
||||||
nmake -f nul
|
nmake -f nul
|
||||||
set TMP=%USERPROFILE%\AppData\Local\Temp
|
set TMP=%USERPROFILE%\AppData\Local\Temp
|
||||||
set TEMP=%USERPROFILE%\AppData\Local\Temp
|
set TEMP=%USERPROFILE%\AppData\Local\Temp
|
||||||
|
Loading…
x
Reference in New Issue
Block a user