Skip to content

Commit 965f9d7

Browse files
authored
Merge pull request #23 from mseng10/update-ci
Update Continuous Integration
2 parents f11d994 + c7e56bc commit 965f9d7

File tree

5 files changed

+22
-108
lines changed

5 files changed

+22
-108
lines changed

.circleci/config.yml

Lines changed: 0 additions & 63 deletions
This file was deleted.

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

Lines changed: 21 additions & 8 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.1"
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.1"
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.1"
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/get-cmake@v3.18.3
44+
4245
- name: Download ITK
4346
run: |
4447
cd ..
@@ -134,7 +137,7 @@ jobs:
134137
matrix:
135138
python-version: [36, 37, 38, 39]
136139
include:
137-
- itk-python-git-tag: "v5.1.1.post1"
140+
- itk-python-git-tag: "v5.2rc01"
138141

139142
steps:
140143
- uses: actions/checkout@v2
@@ -170,11 +173,18 @@ jobs:
170173
max-parallel: 2
171174
matrix:
172175
include:
173-
- itk-python-git-tag: "v5.1.1.post1"
176+
- itk-python-git-tag: "v5.2rc01"
174177

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

181+
- name: 'Specific XCode version'
182+
run: |
183+
sudo xcode-select -s "/Applications/Xcode_11.7.app"
184+
185+
- name: Get specific version of CMake, Ninja
186+
uses: lukka/get-cmake@v3.18.3
187+
178188
- name: 'Fetch build script'
179189
run: |
180190
curl -L https://raw.githubusercontent.com/InsightSoftwareConsortium/ITKPythonPackage/master/scripts/macpython-download-cache-and-build-module-wheels.sh -O
@@ -199,9 +209,12 @@ jobs:
199209
matrix:
200210
python-version-minor: [6, 7, 8, 9]
201211
include:
202-
- itk-python-git-tag: "v5.1.1.post1"
212+
- itk-python-git-tag: "v5.2rc01"
203213

204214
steps:
215+
- name: Get specific version of CMake, Ninja
216+
uses: lukka/get-cmake@v3.18.3
217+
205218
- uses: actions/checkout@v2
206219
with:
207220
path: "im"
@@ -216,7 +229,7 @@ jobs:
216229
shell: bash
217230
run: |
218231
mv im ../../
219-
cd ../../
232+
cd ../../im
220233
curl -L "https://github.com/InsightSoftwareConsortium/ITKPythonBuilds/releases/download/${{ matrix.itk-python-git-tag }}/ITKPythonBuilds-windows.zip" -o "ITKPythonBuilds-windows.zip"
221234
7z x ITKPythonBuilds-windows.zip -o/c/P -aoa -r
222235
curl -L "https://data.kitware.com/api/v1/file/5c0ad59d8d777f2179dd3e9c/download" -o "doxygen-1.8.11.windows.bin.zip"
@@ -237,7 +250,7 @@ jobs:
237250
- name: Publish Python package as GitHub Artifact
238251
uses: actions/upload-artifact@v1
239252
with:
240-
name: WindowWheel3.${{ matrix.python-version-minor }}
253+
name: WindowsWheel3.${{ matrix.python-version-minor }}
241254
path: ../../im/dist
242255

243256
publish-python-packages-to-pypi:

.travis.yml

Lines changed: 0 additions & 15 deletions
This file was deleted.

appveyor.yml

Lines changed: 0 additions & 21 deletions
This file was deleted.

setup.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,6 @@
5050
keywords='ITK InsightToolkit Spatial-Transforms',
5151
url=r'https://github.com/InsightSoftwareConsortium/ITKFixedPointInverseDisplacementField',
5252
install_requires=[
53-
r'itk>=5.1.1'
53+
r'itk>=5.2rc1'
5454
]
5555
)

0 commit comments

Comments
 (0)