@@ -26,20 +26,20 @@ jobs:
2626 matrix :
2727 include :
2828 - vc : 2019
29- vs : 2022
29+ os : 2022
3030 vcvars : ' 10.0.22621.0 -vcvars_ver=14.2' # The default version of MSVC in VS 2022 is broken.
3131 test_task : check
3232 - vc : 2019
33- vs : 2025
33+ os : 2025
3434 vcvars : ' 10.0.22621.0 -vcvars_ver=14.2' # The default version of MSVC in VS 2022 is broken.
3535 test_task : check
3636 - vc : 2019
37- vs : 2025
37+ os : 2025
3838 vcvars : ' 10.0.22621.0 -vcvars_ver=14.2' # The default version of MSVC in VS 2022 is broken.
3939 test_task : test-bundled-gems
4040 fail-fast : false
4141
42- runs-on : windows-${{ matrix.vs }}
42+ runs-on : windows-${{ matrix.os }}
4343
4444 if : >-
4545 ${{!(false
@@ -51,11 +51,11 @@ jobs:
5151 || (github.event_name == 'push' && github.event.pull_request.user.login == 'dependabot[bot]')
5252 )}}
5353
54- name : VisualStudio ${{ matrix.vc || matrix.vs }} (${{ matrix.test_task }})
54+ name : Win ${{ matrix.os }} VS ${{ matrix.vc }} (${{ matrix.test_task }})
5555
5656 env :
5757 GITPULLOPTIONS : --no-tags origin ${{ github.ref }}
58- OS_VER : windows-${{ matrix.vs }}
58+ OS_VER : windows-${{ matrix.os }}
5959 VCPKG_DEFAULT_TRIPLET : ${{ matrix.target || 'x64' }}-windows
6060
6161 steps :
@@ -125,7 +125,7 @@ jobs:
125125 # %TEMP% is inconsistent with %TMP% and test-all expects they are consistent.
126126 # https://github.com/actions/virtual-environments/issues/712#issuecomment-613004302
127127 run : |
128- ::- Set up VC ${{ matrix.vc || matrix.vs }}
128+ ::- Set up VC ${{ matrix.vc }}
129129 set vswhere="%ProgramFiles(x86)%\Microsoft Visual Studio\Installer\vswhere.exe"
130130 for /f "delims=;" %%I in ('%vswhere% -latest -property installationPath') do (
131131 set VCVARS="%%I\VC\Auxiliary\Build\vcvars64.bat"
@@ -180,7 +180,7 @@ jobs:
180180 - name : Set up Launchable
181181 uses : ./.github/actions/launchable/setup
182182 with :
183- os : windows-${{ matrix.vs }}
183+ os : windows-${{ matrix.os }}
184184 launchable-token : ${{ secrets.LAUNCHABLE_TOKEN }}
185185 builddir : build
186186 srcdir : src
@@ -195,7 +195,7 @@ jobs:
195195
196196 - uses : ./.github/actions/slack
197197 with :
198- label : VS ${{ matrix.vc || matrix.vs }} / ${{ matrix.test_task || 'check' }}
198+ label : Win ${{ matrix.os }} VS ${{ matrix.vc }} / ${{ matrix.test_task || 'check' }}
199199 SLACK_WEBHOOK_URL : ${{ secrets.SIMPLER_ALERTS_URL }} # ruby-lang slack: ruby/simpler-alerts-bot
200200 if : ${{ failure() }}
201201
0 commit comments