Skip to content

Commit cd1d3e8

Browse files
authored
github: update windows runner due to 2019 being "stuck" (#8814)
1 parent e88072c commit cd1d3e8

File tree

4 files changed

+9
-6
lines changed

4 files changed

+9
-6
lines changed

.github/workflows/presubmit.yml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,8 +41,7 @@ jobs:
4141
4242
build-windows:
4343
name: build-windows
44-
runs-on: win-2019-16core
45-
44+
runs-on: windows-2022-32core
4645
steps:
4746
- uses: actions/checkout@v4.1.6
4847
with:

.github/workflows/release.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -226,7 +226,7 @@ jobs:
226226
227227
build-windows:
228228
name: build-windows
229-
runs-on: windows-2019-32core
229+
runs-on: windows-2022-32core
230230
if: github.event_name == 'release' || github.event.inputs.platform == 'windows'
231231

232232
steps:

.github/workflows/windows-continuous.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ on:
1010
jobs:
1111
build-windows:
1212
name: build-windows
13-
runs-on: windows-2019-32core
13+
runs-on: windows-2022-32core
1414

1515
steps:
1616
- uses: actions/checkout@v4.1.6

build/windows/build-github.bat

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,11 @@ if "%RUNNING_LOCALLY%" == "1" (
4747
set "PATH=%PATH%;C:\Program Files\7-Zip"
4848
)
4949

50-
call "C:\Program Files (x86)\Microsoft Visual Studio\2019\%VISUAL_STUDIO_VERSION%\VC\Auxiliary\Build\vcvars64.bat"
50+
:: Outdated windows-2019 pattern
51+
:: call "C:\Program Files (x86)\Microsoft Visual Studio\2019\%VISUAL_STUDIO_VERSION%\VC\Auxiliary\Build\vcvars64.bat"
52+
53+
call "C:\Program Files\Microsoft Visual Studio\2022\%VISUAL_STUDIO_VERSION%\VC\Auxiliary\Build\vcvars64.bat"
54+
echo Passed vcvars64.bat
5155
if errorlevel 1 exit /b %errorlevel%
5256

5357
msbuild /version
@@ -107,7 +111,7 @@ cd out\cmake-%variant%
107111
if errorlevel 1 exit /b %errorlevel%
108112

109113
cmake ..\.. ^
110-
-G "Visual Studio 16 2019" ^
114+
-G "Visual Studio 17 2022" ^
111115
-A x64 ^
112116
%flag% ^
113117
-DCMAKE_INSTALL_PREFIX=..\%variant% ^

0 commit comments

Comments
 (0)