Skip to content

Commit

Permalink
ENH: Update CI configuration for ITK 5.2 RC 1
Browse files Browse the repository at this point in the history
  • Loading branch information
thewtex committed Jan 11, 2021
1 parent a074013 commit 709da9a
Show file tree
Hide file tree
Showing 2 changed files with 27 additions and 11 deletions.
36 changes: 26 additions & 10 deletions .github/workflows/build-test-package.yml
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/get-cmake@v3.18.3

- name: Download ITK
run: |
cd ..
Expand Down Expand Up @@ -100,6 +103,9 @@ jobs:
set(dashboard_no_clean 1)
set(ENV{CC} ${{ matrix.c-compiler }})
set(ENV{CXX} ${{ matrix.cxx-compiler }})
if(WIN32)
set(ENV{PATH} "\${CTEST_DASHBOARD_ROOT}/ITK-build/bin;\$ENV{PATH}")
endif()
set(dashboard_cache "
ITK_DIR:PATH=\${CTEST_DASHBOARD_ROOT}/ITK-build
BUILD_TESTING:BOOL=ON
Expand Down Expand Up @@ -128,9 +134,9 @@ jobs:
strategy:
max-parallel: 2
matrix:
python-version: [35, 36, 37, 38]
python-version: [36, 37, 38, 39]
include:
- itk-python-git-tag: "v5.1.1"
- itk-python-git-tag: "v5.2rc01"

steps:
- uses: actions/checkout@v2
Expand Down Expand Up @@ -166,11 +172,18 @@ jobs:
max-parallel: 2
matrix:
include:
- itk-python-git-tag: "v5.1.1"
- 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/get-cmake@v3.18.3

- 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 @@ -193,11 +206,14 @@ jobs:
strategy:
max-parallel: 2
matrix:
python-version-minor: [5, 6, 7, 8]
python-version-minor: [6, 7, 8, 9]
include:
- itk-python-git-tag: "v5.1.1"
- itk-python-git-tag: "v5.2rc01"

steps:
- name: Get specific version of CMake, Ninja
uses: lukka/get-cmake@v3.18.3

- uses: actions/checkout@v2
with:
path: "im"
Expand Down Expand Up @@ -228,12 +244,12 @@ jobs:
set PATH="C:\P\grep;%PATH%"
set CC=cl.exe
set CXX=cl.exe
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"
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" --no-cleanup
- 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
2 changes: 1 addition & 1 deletion setup.py
Expand Up @@ -48,6 +48,6 @@
keywords='ITK InsightToolkit glcm texture features image imaging',
url=r'https://itk.org/',
install_requires=[
r'itk>=5.1.1'
r'itk>=5.2rc1'
]
)

0 comments on commit 709da9a

Please sign in to comment.