Skip to content

Commit cac5a4d

Browse files
committed
ENH: Bump ITK workflows for v5.3rc04.post4.
Updates cookiecutter CI workflow to rely on ITKRemoteModuleBuildTestPackageAction reusable workflows for easier maintenance. Updates ITK reference to v5.3rc04.post4 and applies version updates from reusable workflow. See InsightSoftwareConsortium/ITKRemoteModuleBuildTestPackageAction#9
1 parent 675a0d0 commit cac5a4d

File tree

2 files changed

+27
-291
lines changed

2 files changed

+27
-291
lines changed

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

Lines changed: 21 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -3,22 +3,22 @@ name: Build, test, package
33
on: [push,pull_request]
44

55
env:
6-
itk-git-tag: "171fb2ba33a87041f99328a2f26612ff33aa9cc8"
7-
itk-wheel-tag: "v5.3rc04.post3"
6+
itk-git-tag: "abf5fa10522a36bc51f42f20f426a622f42ed90d"
7+
itk-wheel-tag: "v5.3rc04.post4"
88

99
jobs:
1010
build-test-cxx:
1111
runs-on: ${{ matrix.os }}
1212
strategy:
1313
max-parallel: 3
1414
matrix:
15-
os: [ubuntu-20.04, windows-2019, macos-11]
15+
os: [ubuntu-20.04, windows-2022, macos-11]
1616
include:
1717
- os: ubuntu-20.04
1818
c-compiler: "gcc"
1919
cxx-compiler: "g++"
2020
cmake-build-type: "MinSizeRel"
21-
- os: windows-2019
21+
- os: windows-2022
2222
c-compiler: "cl.exe"
2323
cxx-compiler: "cl.exe"
2424
cmake-build-type: "Release"
@@ -42,7 +42,7 @@ jobs:
4242
python -m pip install cookiecutter
4343
4444
- name: Get specific version of CMake, Ninja
45-
uses: lukka/get-cmake@v3.18.3
45+
uses: lukka/get-cmake@v3.22.2
4646

4747
- name: Download ITK
4848
run: |
@@ -52,7 +52,7 @@ jobs:
5252
git checkout ${{ env.itk-git-tag }}
5353
5454
- name: Build ITK
55-
if: matrix.os != 'windows-2019'
55+
if: matrix.os != 'windows-2022'
5656
run: |
5757
cd ..
5858
mkdir ITK-build
@@ -61,12 +61,12 @@ jobs:
6161
ninja
6262
6363
- name: Build ITK
64-
if: matrix.os == 'windows-2019'
64+
if: matrix.os == 'windows-2022'
6565
run: |
6666
cd ..
6767
mkdir ITK-build
6868
cd ITK-build
69-
call "C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\VC\Auxiliary\Build\vcvars64.bat"
69+
call "C:\Program Files\Microsoft Visual Studio\2022\Enterprise\VC\Auxiliary\Build\vcvars64.bat"
7070
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 -GNinja ../ITK
7171
ninja
7272
shell: cmd
@@ -126,14 +126,14 @@ jobs:
126126
cat dashboard.cmake
127127
128128
- name: Build and test
129-
if: matrix.os != 'windows-2019'
129+
if: matrix.os != 'windows-2022'
130130
run: |
131131
ctest --output-on-failure -j 2 -V -S dashboard.cmake
132132
133133
- name: Build and test
134-
if: matrix.os == 'windows-2019'
134+
if: matrix.os == 'windows-2022'
135135
run: |
136-
call "C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\VC\Auxiliary\Build\vcvars64.bat"
136+
call "C:\Program Files\Microsoft Visual Studio\2022\Enterprise\VC\Auxiliary\Build\vcvars64.bat"
137137
ctest --output-on-failure -j 2 -V -S dashboard.cmake
138138
shell: cmd
139139

@@ -142,7 +142,7 @@ jobs:
142142
strategy:
143143
max-parallel: 2
144144
matrix:
145-
python-version: ["37", "38", "39", "310"]
145+
python-version: ["37", "38", "39", "310", "311"]
146146

147147
steps:
148148
- uses: actions/checkout@v2
@@ -156,6 +156,12 @@ jobs:
156156
sudo rm -rf "$AGENT_TOOLSDIRECTORY"
157157
df -h
158158
159+
- name: 'Fetch build dependencies'
160+
shell: bash
161+
run: |
162+
sudo apt install zstd
163+
unzstd --version
164+
159165
- name: Set up Python 3.8
160166
uses: actions/setup-python@v2
161167
with:
@@ -238,11 +244,11 @@ jobs:
238244
path: Evaluated/ITKModuleTemplate/dist
239245

240246
build-windows-python-packages:
241-
runs-on: windows-2019
247+
runs-on: windows-2022
242248
strategy:
243249
max-parallel: 2
244250
matrix:
245-
python-version-minor: ["7", "8", "9", "10"]
251+
python-version-minor: ["7", "8", "9", "10", "11"]
246252

247253
steps:
248254
- uses: actions/checkout@v2
@@ -287,7 +293,7 @@ jobs:
287293
shell: cmd
288294
run: |
289295
cd Evaluated/ITKModuleTemplate
290-
call "C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\VC\Auxiliary\Build\vcvars64.bat"
296+
call "C:\Program Files\Microsoft Visual Studio\2022\Enterprise\VC\Auxiliary\Build\vcvars64.bat"
291297
set PATH=C:\P\grep;%PATH%
292298
set CC=cl.exe
293299
set CXX=cl.exe

0 commit comments

Comments
 (0)