Skip to content

Commit 29ad46f

Browse files
authored
Merge pull request #9 from InsightSoftwareConsortium/bump-itk
ENH: Bump for ITK v5.3rc04.post4
2 parents bf603c0 + e892e8c commit 29ad46f

File tree

2 files changed

+21
-15
lines changed

2 files changed

+21
-15
lines changed

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

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -15,21 +15,21 @@ on:
1515
itk-git-tag:
1616
required: false
1717
type: string
18-
default: '171fb2ba33a87041f99328a2f26612ff33aa9cc8'
18+
default: 'abf5fa10522a36bc51f42f20f426a622f42ed90d'
1919

2020
jobs:
2121
build-test-cxx:
2222
runs-on: ${{ matrix.os }}
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"
@@ -52,7 +52,7 @@ jobs:
5252
python -m pip install ninja
5353
5454
- name: Get specific version of CMake, Ninja
55-
uses: lukka/get-cmake@v3.18.3
55+
uses: lukka/get-cmake@v3.22.2
5656

5757
- name: Download ITK
5858
run: |
@@ -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: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ on:
1010
itk-wheel-tag:
1111
required: false
1212
type: string
13-
default: 'v5.3rc04.post3'
13+
default: 'v5.3rc04.post4'
1414
secrets:
1515
pypi_password:
1616
required: false # Packages will not be uploaded to PyPI if not set
@@ -21,7 +21,7 @@ jobs:
2121
strategy:
2222
max-parallel: 2
2323
matrix:
24-
python-version: ["37", "38", "39", "310"]
24+
python-version: ["37", "38", "39", "310", "311"]
2525

2626
steps:
2727
- uses: actions/checkout@v2
@@ -35,6 +35,12 @@ jobs:
3535
sudo rm -rf "$AGENT_TOOLSDIRECTORY"
3636
df -h
3737
38+
- name: 'Fetch build dependencies'
39+
shell: bash
40+
run: |
41+
sudo apt install zstd
42+
unzstd --version
43+
3844
- name: 'Fetch build script'
3945
run: |
4046
curl -L https://raw.githubusercontent.com/InsightSoftwareConsortium/ITKPythonPackage/master/scripts/dockcross-manylinux-download-cache-and-build-module-wheels.sh -O
@@ -101,11 +107,11 @@ jobs:
101107
path: dist
102108

103109
build-windows-python-packages:
104-
runs-on: windows-2019
110+
runs-on: windows-2022
105111
strategy:
106112
max-parallel: 2
107113
matrix:
108-
python-version-minor: ["7", "8", "9", "10"]
114+
python-version-minor: ["7", "8", "9", "10", "11"]
109115

110116
steps:
111117
- name: Get specific version of CMake, Ninja
@@ -137,7 +143,7 @@ jobs:
137143
shell: cmd
138144
run: |
139145
cd ../../im
140-
call "C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\VC\Auxiliary\Build\vcvars64.bat"
146+
call "C:\Program Files\Microsoft Visual Studio\2022\Enterprise\VC\Auxiliary\Build\vcvars64.bat"
141147
set PATH=C:\P\grep;%PATH%
142148
set CC=cl.exe
143149
set CXX=cl.exe

0 commit comments

Comments
 (0)