Skip to content

Commit 4fdae54

Browse files
authored
Merge pull request #126 from tbirdso/bump-itk-version
ENH: Bump to ITK v5.3rc04
2 parents 3ba8f7f + ea6fcb1 commit 4fdae54

File tree

1 file changed

+9
-15
lines changed

1 file changed

+9
-15
lines changed

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

Lines changed: 9 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,10 @@ name: Build, test, package
22

33
on: [push,pull_request]
44

5+
env:
6+
itk-git-tag: "801370c025c7d296783481779a41c6d559c992c5"
7+
itk-wheel-tag: "v5.3rc04"
8+
59
jobs:
610
build-test-cxx:
711
runs-on: ${{ matrix.os }}
@@ -13,17 +17,14 @@ jobs:
1317
- os: ubuntu-20.04
1418
c-compiler: "gcc"
1519
cxx-compiler: "g++"
16-
itk-git-tag: "v5.3rc03"
1720
cmake-build-type: "MinSizeRel"
1821
- os: windows-2019
1922
c-compiler: "cl.exe"
2023
cxx-compiler: "cl.exe"
21-
itk-git-tag: "v5.3rc03"
2224
cmake-build-type: "Release"
2325
- os: macos-10.15
2426
c-compiler: "clang"
2527
cxx-compiler: "clang++"
26-
itk-git-tag: "v5.3rc03"
2728
cmake-build-type: "MinSizeRel"
2829

2930
steps:
@@ -48,7 +49,7 @@ jobs:
4849
cd ..
4950
git clone https://github.com/InsightSoftwareConsortium/ITK.git
5051
cd ITK
51-
git checkout ${{ matrix.itk-git-tag }}
52+
git checkout ${{ env.itk-git-tag }}
5253
5354
- name: Build ITK
5455
if: matrix.os != 'windows-2019'
@@ -142,8 +143,6 @@ jobs:
142143
max-parallel: 2
143144
matrix:
144145
python-version: [37, 38, 39, 310]
145-
include:
146-
- itk-python-git-tag: "v5.3rc03"
147146

148147
steps:
149148
- uses: actions/checkout@v2
@@ -177,7 +176,7 @@ jobs:
177176
- name: 'Build 🐍 Python 📦 package'
178177
run: |
179178
cd "${GITHUB_WORKSPACE}/Evaluated/ITKModuleTemplate"
180-
export ITK_PACKAGE_VERSION=${{ matrix.itk-python-git-tag }}
179+
export ITK_PACKAGE_VERSION=${{ env.itk-wheel-tag }}
181180
../../dockcross-manylinux-download-cache-and-build-module-wheels.sh cp${{ matrix.python-version }}
182181
183182
- name: Publish Python package as GitHub Artifact
@@ -190,9 +189,6 @@ jobs:
190189
runs-on: macos-10.15
191190
strategy:
192191
max-parallel: 2
193-
matrix:
194-
include:
195-
- itk-python-git-tag: "v5.3rc03"
196192

197193
steps:
198194
- uses: actions/checkout@v2
@@ -224,7 +220,7 @@ jobs:
224220
- name: 'Build 🐍 Python 📦 package'
225221
run: |
226222
cd "${GITHUB_WORKSPACE}/Evaluated/ITKModuleTemplate"
227-
export ITK_PACKAGE_VERSION=${{ matrix.itk-python-git-tag }}
223+
export ITK_PACKAGE_VERSION=${{ env.itk-wheel-tag }}
228224
export MACOSX_DEPLOYMENT_TARGET=10.9
229225
../../macpython-download-cache-and-build-module-wheels.sh
230226
@@ -240,8 +236,6 @@ jobs:
240236
max-parallel: 2
241237
matrix:
242238
python-version-minor: [7, 8, 9, 10]
243-
include:
244-
- itk-python-git-tag: "v5.3rc03"
245239

246240
steps:
247241
- uses: actions/checkout@v2
@@ -275,7 +269,7 @@ jobs:
275269
shell: bash
276270
run: |
277271
cd Evaluated/ITKModuleTemplate
278-
curl -L "https://github.com/InsightSoftwareConsortium/ITKPythonBuilds/releases/download/${{ matrix.itk-python-git-tag }}/ITKPythonBuilds-windows.zip" -o "ITKPythonBuilds-windows.zip"
272+
curl -L "https://github.com/InsightSoftwareConsortium/ITKPythonBuilds/releases/download/${{ env.itk-wheel-tag }}/ITKPythonBuilds-windows.zip" -o "ITKPythonBuilds-windows.zip"
279273
7z x ITKPythonBuilds-windows.zip -o/c/P -aoa -r
280274
curl -L "https://data.kitware.com/api/v1/file/5c0ad59d8d777f2179dd3e9c/download" -o "doxygen-1.8.11.windows.bin.zip"
281275
7z x doxygen-1.8.11.windows.bin.zip -o/c/P/doxygen -aoa -r
@@ -287,7 +281,7 @@ jobs:
287281
run: |
288282
cd Evaluated/ITKModuleTemplate
289283
call "C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\VC\Auxiliary\Build\vcvars64.bat"
290-
set PATH="C:\P\grep;%PATH%"
284+
set PATH=C:\P\grep;%PATH%
291285
set CC=cl.exe
292286
set CXX=cl.exe
293287
C:\Python3${{ matrix.python-version-minor }}-x64\python.exe C:\P\IPP\scripts\windows_build_module_wheels.py --py-envs "3${{ matrix.python-version-minor }}-x64"

0 commit comments

Comments
 (0)