Skip to content

Commit 7bb9c5a

Browse files
authored
Merge pull request #31 from mseng10/update-ci
Update Continuous Integration
2 parents 1f5c55e + ac3c663 commit 7bb9c5a

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/[email protected]
44+
4245
- name: Download ITK
4346
run: |
4447
cd ..
@@ -133,7 +136,7 @@ jobs:
133136
matrix:
134137
python-version: [36, 37, 38, 39]
135138
include:
136-
- itk-python-git-tag: "v5.1.1.post1"
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.1.post1"
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,9 +208,12 @@ jobs:
198208
matrix:
199209
python-version-minor: [6, 7, 8, 9]
200210
include:
201-
- itk-python-git-tag: "v5.1.1.post1"
211+
- itk-python-git-tag: "v5.2rc01"
202212

203213
steps:
214+
- name: Get specific version of CMake, Ninja
215+
uses: lukka/[email protected]
216+
204217
- uses: actions/checkout@v2
205218
with:
206219
path: "im"
@@ -215,7 +228,7 @@ jobs:
215228
shell: bash
216229
run: |
217230
mv im ../../
218-
cd ../../
231+
cd ../../im
219232
curl -L "https://github.com/InsightSoftwareConsortium/ITKPythonBuilds/releases/download/${{ matrix.itk-python-git-tag }}/ITKPythonBuilds-windows.zip" -o "ITKPythonBuilds-windows.zip"
220233
7z x ITKPythonBuilds-windows.zip -o/c/P -aoa -r
221234
curl -L "https://data.kitware.com/api/v1/file/5c0ad59d8d777f2179dd3e9c/download" -o "doxygen-1.8.11.windows.bin.zip"
@@ -236,7 +249,7 @@ jobs:
236249
- name: Publish Python package as GitHub Artifact
237250
uses: actions/upload-artifact@v1
238251
with:
239-
name: WindowWheel3.${{ matrix.python-version-minor }}
252+
name: WindowsWheel3.${{ matrix.python-version-minor }}
240253
path: ../../im/dist
241254

242255
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
@@ -45,6 +45,6 @@
4545
keywords='ITK InsightToolkit FDF',
4646
url=r'https://github.com/InsightSoftwareConsortium/ITKIOFDF',
4747
install_requires=[
48-
r'itk>=5.1.1'
48+
r'itk>=5.2rc1'
4949
]
5050
)

0 commit comments

Comments
 (0)