Skip to content

Commit

Permalink
Merge pull request #31 from mseng10/update-ci
Browse files Browse the repository at this point in the history
Update Continuous Integration
  • Loading branch information
thewtex authored Jan 14, 2021
2 parents 1f5c55e + ac3c663 commit 7bb9c5a
Show file tree
Hide file tree
Showing 5 changed files with 22 additions and 108 deletions.
63 changes: 0 additions & 63 deletions .circleci/config.yml

This file was deleted.

29 changes: 21 additions & 8 deletions .github/workflows/build-test-package.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,17 +13,17 @@ jobs:
- os: ubuntu-18.04
c-compiler: "gcc"
cxx-compiler: "g++"
itk-git-tag: "v5.1.1"
itk-git-tag: "abd38d5a0040b9a8fbb0ad3127089dbb72a93342"
cmake-build-type: "MinSizeRel"
- os: windows-2019
c-compiler: "cl.exe"
cxx-compiler: "cl.exe"
itk-git-tag: "v5.1.1"
itk-git-tag: "abd38d5a0040b9a8fbb0ad3127089dbb72a93342"
cmake-build-type: "Release"
- os: macos-10.15
c-compiler: "clang"
cxx-compiler: "clang++"
itk-git-tag: "v5.1.1"
itk-git-tag: "abd38d5a0040b9a8fbb0ad3127089dbb72a93342"
cmake-build-type: "MinSizeRel"

steps:
Expand All @@ -39,6 +39,9 @@ jobs:
python -m pip install --upgrade pip
python -m pip install ninja
- name: Get specific version of CMake, Ninja
uses: lukka/[email protected]

- name: Download ITK
run: |
cd ..
Expand Down Expand Up @@ -133,7 +136,7 @@ jobs:
matrix:
python-version: [36, 37, 38, 39]
include:
- itk-python-git-tag: "v5.1.1.post1"
- itk-python-git-tag: "v5.2rc01"

steps:
- uses: actions/checkout@v2
Expand Down Expand Up @@ -169,11 +172,18 @@ jobs:
max-parallel: 2
matrix:
include:
- itk-python-git-tag: "v5.1.1.post1"
- itk-python-git-tag: "v5.2rc01"

steps:
- uses: actions/checkout@v2

- name: 'Specific XCode version'
run: |
sudo xcode-select -s "/Applications/Xcode_11.7.app"
- name: Get specific version of CMake, Ninja
uses: lukka/[email protected]

- name: 'Fetch build script'
run: |
curl -L https://raw.githubusercontent.com/InsightSoftwareConsortium/ITKPythonPackage/master/scripts/macpython-download-cache-and-build-module-wheels.sh -O
Expand All @@ -198,9 +208,12 @@ jobs:
matrix:
python-version-minor: [6, 7, 8, 9]
include:
- itk-python-git-tag: "v5.1.1.post1"
- itk-python-git-tag: "v5.2rc01"

steps:
- name: Get specific version of CMake, Ninja
uses: lukka/[email protected]

- uses: actions/checkout@v2
with:
path: "im"
Expand All @@ -215,7 +228,7 @@ jobs:
shell: bash
run: |
mv im ../../
cd ../../
cd ../../im
curl -L "https://github.com/InsightSoftwareConsortium/ITKPythonBuilds/releases/download/${{ matrix.itk-python-git-tag }}/ITKPythonBuilds-windows.zip" -o "ITKPythonBuilds-windows.zip"
7z x ITKPythonBuilds-windows.zip -o/c/P -aoa -r
curl -L "https://data.kitware.com/api/v1/file/5c0ad59d8d777f2179dd3e9c/download" -o "doxygen-1.8.11.windows.bin.zip"
Expand All @@ -236,7 +249,7 @@ jobs:
- name: Publish Python package as GitHub Artifact
uses: actions/upload-artifact@v1
with:
name: WindowWheel3.${{ matrix.python-version-minor }}
name: WindowsWheel3.${{ matrix.python-version-minor }}
path: ../../im/dist

publish-python-packages-to-pypi:
Expand Down
15 changes: 0 additions & 15 deletions .travis.yml

This file was deleted.

21 changes: 0 additions & 21 deletions appveyor.yml

This file was deleted.

2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,6 @@
keywords='ITK InsightToolkit FDF',
url=r'https://github.com/InsightSoftwareConsortium/ITKIOFDF',
install_requires=[
r'itk>=5.1.1'
r'itk>=5.2rc1'
]
)

0 comments on commit 7bb9c5a

Please sign in to comment.