Skip to content

Commit 6381015

Browse files
authored
Merge pull request #32 from mseng10/update-ci
COMP: Update GitHub Actions from ITKModuleTemplate
2 parents eafe0c5 + c4e295a commit 6381015

File tree

2 files changed

+21
-11
lines changed

2 files changed

+21
-11
lines changed

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

Lines changed: 20 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -13,17 +13,17 @@ jobs:
1313
- os: ubuntu-18.04
1414
c-compiler: "gcc"
1515
cxx-compiler: "g++"
16-
itk-git-tag: "v5.1.2"
16+
itk-git-tag: "abd38d5a0040b9a8fbb0ad3127089dbb72a93342"
1717
cmake-build-type: "MinSizeRel"
1818
- os: windows-2019
1919
c-compiler: "cl.exe"
2020
cxx-compiler: "cl.exe"
21-
itk-git-tag: "v5.1.2"
21+
itk-git-tag: "abd38d5a0040b9a8fbb0ad3127089dbb72a93342"
2222
cmake-build-type: "Release"
2323
- os: macos-10.15
2424
c-compiler: "clang"
2525
cxx-compiler: "clang++"
26-
itk-git-tag: "v5.1.2"
26+
itk-git-tag: "abd38d5a0040b9a8fbb0ad3127089dbb72a93342"
2727
cmake-build-type: "MinSizeRel"
2828

2929
steps:
@@ -39,6 +39,9 @@ jobs:
3939
python -m pip install --upgrade pip
4040
python -m pip install ninja
4141
42+
- name: Get specific version of CMake, Ninja
43+
uses: lukka/[email protected]
44+
4245
- name: Download ITK
4346
run: |
4447
cd ..
@@ -52,7 +55,7 @@ jobs:
5255
cd ..
5356
mkdir ITK-build
5457
cd ITK-build
55-
cmake -DCMAKE_C_COMPILER:FILEPATH="${{ matrix.c-compiler }}" -DBUILD_SHARED_LIBS:BOOL=OFF -DCMAKE_CXX_COMPILER="${{ matrix.cxx-compiler }}" -DCMAKE_BUILD_TYPE:STRING=${{ matrix.cmake-build-type }} -DBUILD_TESTING:BOOL=OFF -GNinja ../ITK
58+
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
5659
ninja
5760
5861
- name: Build ITK
@@ -62,7 +65,7 @@ jobs:
6265
mkdir ITK-build
6366
cd ITK-build
6467
call "C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\VC\Auxiliary\Build\vcvars64.bat"
65-
cmake -DCMAKE_C_COMPILER:FILEPATH="${{ matrix.c-compiler }}" -DBUILD_SHARED_LIBS:BOOL=OFF -DCMAKE_CXX_COMPILER="${{ matrix.cxx-compiler }}" -DCMAKE_BUILD_TYPE:STRING=${{ matrix.cmake-build-type }} -DBUILD_TESTING:BOOL=OFF -GNinja ../ITK
68+
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
6669
ninja
6770
shell: cmd
6871

@@ -133,7 +136,7 @@ jobs:
133136
matrix:
134137
python-version: [36, 37, 38, 39]
135138
include:
136-
- itk-python-git-tag: "v5.1.2"
139+
- itk-python-git-tag: "v5.2rc01"
137140

138141
steps:
139142
- uses: actions/checkout@v2
@@ -169,11 +172,18 @@ jobs:
169172
max-parallel: 2
170173
matrix:
171174
include:
172-
- itk-python-git-tag: "v5.1.2"
175+
- itk-python-git-tag: "v5.2rc01"
173176

174177
steps:
175178
- uses: actions/checkout@v2
176179

180+
- name: 'Specific XCode version'
181+
run: |
182+
sudo xcode-select -s "/Applications/Xcode_11.7.app"
183+
184+
- name: Get specific version of CMake, Ninja
185+
uses: lukka/[email protected]
186+
177187
- name: 'Fetch build script'
178188
run: |
179189
curl -L https://raw.githubusercontent.com/InsightSoftwareConsortium/ITKPythonPackage/master/scripts/macpython-download-cache-and-build-module-wheels.sh -O
@@ -198,7 +208,7 @@ jobs:
198208
matrix:
199209
python-version-minor: [6, 7, 8, 9]
200210
include:
201-
- itk-python-git-tag: "v5.1.2"
211+
- itk-python-git-tag: "v5.2rc01"
202212

203213
steps:
204214
- uses: actions/checkout@v2
@@ -215,7 +225,7 @@ jobs:
215225
shell: bash
216226
run: |
217227
mv im ../../
218-
cd ../../
228+
cd ../../im
219229
curl -L "https://github.com/InsightSoftwareConsortium/ITKPythonBuilds/releases/download/${{ matrix.itk-python-git-tag }}/ITKPythonBuilds-windows.zip" -o "ITKPythonBuilds-windows.zip"
220230
7z x ITKPythonBuilds-windows.zip -o/c/P -aoa -r
221231
curl -L "https://data.kitware.com/api/v1/file/5c0ad59d8d777f2179dd3e9c/download" -o "doxygen-1.8.11.windows.bin.zip"
@@ -236,7 +246,7 @@ jobs:
236246
- name: Publish Python package as GitHub Artifact
237247
uses: actions/upload-artifact@v1
238248
with:
239-
name: WindowWheel3.${{ matrix.python-version-minor }}
249+
name: WindowsWheel3.${{ matrix.python-version-minor }}
240250
path: ../../im/dist
241251

242252
publish-python-packages-to-pypi:

setup.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,6 @@
5252
keywords='ITK InsightToolkit Math-morphology Label-images',
5353
url=r'https://github.com/InsightSoftwareConsortium/ITKLabelErodeDilate',
5454
install_requires=[
55-
r'itk>=5.1.2'
55+
r'itk>=5.2rc1'
5656
]
5757
)

0 commit comments

Comments
 (0)