Skip to content

Commit 15e2045

Browse files
committed
ENH: Bump Windows runners to windows-2022
Resolves compiler mismatch issue where ITK v5.3rc04.post4 build archives were built with VS22 compiler
1 parent 1e5c579 commit 15e2045

File tree

2 files changed

+10
-10
lines changed

2 files changed

+10
-10
lines changed

.github/workflows/build-test-cxx.yml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -23,13 +23,13 @@ jobs:
2323
strategy:
2424
max-parallel: 3
2525
matrix:
26-
os: [ubuntu-20.04, windows-2019, macos-11]
26+
os: [ubuntu-20.04, windows-2022, macos-11]
2727
include:
2828
- os: ubuntu-20.04
2929
c-compiler: "gcc"
3030
cxx-compiler: "g++"
3131
cmake-build-type: "MinSizeRel"
32-
- os: windows-2019
32+
- os: windows-2022
3333
c-compiler: "cl.exe"
3434
cxx-compiler: "cl.exe"
3535
cmake-build-type: "Release"
@@ -62,7 +62,7 @@ jobs:
6262
git checkout ${{ inputs.itk-git-tag }}
6363
6464
- name: Build ITK
65-
if: matrix.os != 'windows-2019'
65+
if: matrix.os != 'windows-2022'
6666
run: |
6767
cd ..
6868
mkdir ITK-build
@@ -71,12 +71,12 @@ jobs:
7171
ninja
7272
7373
- name: Build ITK
74-
if: matrix.os == 'windows-2019'
74+
if: matrix.os == 'windows-2022'
7575
run: |
7676
cd ..
7777
mkdir ITK-build
7878
cd ITK-build
79-
call "C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\VC\Auxiliary\Build\vcvars64.bat"
79+
call "C:\Program Files\Microsoft Visual Studio\2022\Enterprise\VC\Auxiliary\Build\vcvars64.bat"
8080
cmake -DCMAKE_C_COMPILER:FILEPATH="${{ matrix.c-compiler }}" -DBUILD_SHARED_LIBS:BOOL=ON -DCMAKE_CXX_COMPILER="${{ matrix.cxx-compiler }}" -DCMAKE_BUILD_TYPE:STRING=${{ matrix.cmake-build-type }} -DBUILD_TESTING:BOOL=OFF ${{ inputs.itk-cmake-options }} -GNinja ../ITK
8181
ninja
8282
shell: cmd
@@ -131,13 +131,13 @@ jobs:
131131
cat dashboard.cmake
132132
133133
- name: Build and test
134-
if: matrix.os != 'windows-2019'
134+
if: matrix.os != 'windows-2022'
135135
run: |
136136
ctest --output-on-failure -j 2 -V -S dashboard.cmake ${{ inputs.ctest-options }}
137137
138138
- name: Build and test
139-
if: matrix.os == 'windows-2019'
139+
if: matrix.os == 'windows-2022'
140140
run: |
141-
call "C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\VC\Auxiliary\Build\vcvars64.bat"
141+
call "C:\Program Files\Microsoft Visual Studio\2022\Enterprise\VC\Auxiliary\Build\vcvars64.bat"
142142
ctest --output-on-failure -j 2 -V -S dashboard.cmake ${{ inputs.ctest-options }}
143143
shell: cmd

.github/workflows/build-test-package-python.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@ jobs:
101101
path: dist
102102

103103
build-windows-python-packages:
104-
runs-on: windows-2019
104+
runs-on: windows-2022
105105
strategy:
106106
max-parallel: 2
107107
matrix:
@@ -137,7 +137,7 @@ jobs:
137137
shell: cmd
138138
run: |
139139
cd ../../im
140-
call "C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\VC\Auxiliary\Build\vcvars64.bat"
140+
call "C:\Program Files\Microsoft Visual Studio\2022\Enterprise\VC\Auxiliary\Build\vcvars64.bat"
141141
set PATH=C:\P\grep;%PATH%
142142
set CC=cl.exe
143143
set CXX=cl.exe

0 commit comments

Comments
 (0)