File tree Expand file tree Collapse file tree 1 file changed +12
-10
lines changed
Expand file tree Collapse file tree 1 file changed +12
-10
lines changed Original file line number Diff line number Diff line change @@ -25,19 +25,21 @@ jobs:
2525 strategy :
2626 matrix :
2727 include :
28- - vc : 2015
29- vs : 2019
30- vcvars : ' 10.0.14393 .0 -vcvars_ver=14.0 ' # The oldest Windows 10 SDK w/ VC++ 2015 toolset (v140)
28+ - vc : 2019
29+ vs : 2022
30+ vcvars : ' 10.0.22621 .0 -vcvars_ver=14.2 ' # The default version of MSVC in VS 2022 is broken.
3131 test_task : check
32- - vs : 2019
32+ - vc : 2019
33+ vs : 2025
34+ vcvars : ' 10.0.22621.0 -vcvars_ver=14.2' # The default version of MSVC in VS 2022 is broken.
3335 test_task : check
34- - vs : 2019
36+ - vc : 2019
37+ vs : 2025
38+ vcvars : ' 10.0.22621.0 -vcvars_ver=14.2' # The default version of MSVC in VS 2022 is broken.
3539 test_task : test-bundled-gems
36- # - vs: 2022
37- # test_task: check
3840 fail-fast : false
3941
40- runs-on : windows-${{ matrix.vs < 2022 && '2019' || matrix.vs }}
42+ runs-on : windows-${{ matrix.vs }}
4143
4244 if : >-
4345 ${{!(false
5355
5456 env :
5557 GITPULLOPTIONS : --no-tags origin ${{ github.ref }}
56- OS_VER : windows-${{ matrix.vs < 2022 && '2019' || matrix.vs }}
58+ OS_VER : windows-${{ matrix.vs }}
5759 VCPKG_DEFAULT_TRIPLET : ${{ matrix.target || 'x64' }}-windows
5860
5961 steps :
@@ -178,7 +180,7 @@ jobs:
178180 - name : Set up Launchable
179181 uses : ./.github/actions/launchable/setup
180182 with :
181- os : windows-${{ matrix.vs < 2022 && '2019' || matrix.vs }}
183+ os : windows-${{ matrix.vs }}
182184 launchable-token : ${{ secrets.LAUNCHABLE_TOKEN }}
183185 builddir : build
184186 srcdir : src
You can’t perform that action at this time.
0 commit comments