Skip to content

ENH: Bump for ITK v5.3rc04.post4 #9

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Nov 18, 2022
Merged

ENH: Bump for ITK v5.3rc04.post4 #9

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
1e5c579
ENH: Bump for ITK v5.3rc04.post4
tbirdso Nov 15, 2022
15e2045
ENH: Bump Windows runners to `windows-2022`
tbirdso Nov 16, 2022
5ae6fb0
ENH: Install unzstd dependency on Linux
tbirdso Nov 17, 2022
e892e8c
ENH: Bump CMake to v3.22.2 and Ninja to 1.10.2
tbirdso Nov 17, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 10 additions & 10 deletions .github/workflows/build-test-cxx.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,21 +15,21 @@ on:
itk-git-tag:
required: false
type: string
default: '171fb2ba33a87041f99328a2f26612ff33aa9cc8'
default: 'abf5fa10522a36bc51f42f20f426a622f42ed90d'

jobs:
build-test-cxx:
runs-on: ${{ matrix.os }}
strategy:
max-parallel: 3
matrix:
os: [ubuntu-20.04, windows-2019, macos-11]
os: [ubuntu-20.04, windows-2022, macos-11]
include:
- os: ubuntu-20.04
c-compiler: "gcc"
cxx-compiler: "g++"
cmake-build-type: "MinSizeRel"
- os: windows-2019
- os: windows-2022
c-compiler: "cl.exe"
cxx-compiler: "cl.exe"
cmake-build-type: "Release"
Expand All @@ -52,7 +52,7 @@ jobs:
python -m pip install ninja

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

- name: Download ITK
run: |
Expand All @@ -62,7 +62,7 @@ jobs:
git checkout ${{ inputs.itk-git-tag }}

- name: Build ITK
if: matrix.os != 'windows-2019'
if: matrix.os != 'windows-2022'
run: |
cd ..
mkdir ITK-build
Expand All @@ -71,12 +71,12 @@ jobs:
ninja

- name: Build ITK
if: matrix.os == 'windows-2019'
if: matrix.os == 'windows-2022'
run: |
cd ..
mkdir ITK-build
cd ITK-build
call "C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\VC\Auxiliary\Build\vcvars64.bat"
call "C:\Program Files\Microsoft Visual Studio\2022\Enterprise\VC\Auxiliary\Build\vcvars64.bat"
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 ${{ inputs.itk-cmake-options }} -GNinja ../ITK
ninja
shell: cmd
Expand Down Expand Up @@ -131,13 +131,13 @@ jobs:
cat dashboard.cmake

- name: Build and test
if: matrix.os != 'windows-2019'
if: matrix.os != 'windows-2022'
run: |
ctest --output-on-failure -j 2 -V -S dashboard.cmake ${{ inputs.ctest-options }}

- name: Build and test
if: matrix.os == 'windows-2019'
if: matrix.os == 'windows-2022'
run: |
call "C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\VC\Auxiliary\Build\vcvars64.bat"
call "C:\Program Files\Microsoft Visual Studio\2022\Enterprise\VC\Auxiliary\Build\vcvars64.bat"
ctest --output-on-failure -j 2 -V -S dashboard.cmake ${{ inputs.ctest-options }}
shell: cmd
16 changes: 11 additions & 5 deletions .github/workflows/build-test-package-python.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ on:
itk-wheel-tag:
required: false
type: string
default: 'v5.3rc04.post3'
default: 'v5.3rc04.post4'
secrets:
pypi_password:
required: false # Packages will not be uploaded to PyPI if not set
Expand All @@ -21,7 +21,7 @@ jobs:
strategy:
max-parallel: 2
matrix:
python-version: ["37", "38", "39", "310"]
python-version: ["37", "38", "39", "310", "311"]

steps:
- uses: actions/checkout@v2
Expand All @@ -35,6 +35,12 @@ jobs:
sudo rm -rf "$AGENT_TOOLSDIRECTORY"
df -h

- name: 'Fetch build dependencies'
shell: bash
run: |
sudo apt install zstd
unzstd --version

- name: 'Fetch build script'
run: |
curl -L https://raw.githubusercontent.com/InsightSoftwareConsortium/ITKPythonPackage/master/scripts/dockcross-manylinux-download-cache-and-build-module-wheels.sh -O
Expand Down Expand Up @@ -101,11 +107,11 @@ jobs:
path: dist

build-windows-python-packages:
runs-on: windows-2019
runs-on: windows-2022
strategy:
max-parallel: 2
matrix:
python-version-minor: ["7", "8", "9", "10"]
python-version-minor: ["7", "8", "9", "10", "11"]

steps:
- name: Get specific version of CMake, Ninja
Expand Down Expand Up @@ -137,7 +143,7 @@ jobs:
shell: cmd
run: |
cd ../../im
call "C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\VC\Auxiliary\Build\vcvars64.bat"
call "C:\Program Files\Microsoft Visual Studio\2022\Enterprise\VC\Auxiliary\Build\vcvars64.bat"
set PATH=C:\P\grep;%PATH%
set CC=cl.exe
set CXX=cl.exe
Expand Down