From 1e5c5793cb7de2323426cabd02e702983058b7ad Mon Sep 17 00:00:00 2001 From: Tom Birdsong Date: Tue, 15 Nov 2022 12:36:17 -0500 Subject: [PATCH 1/4] ENH: Bump for ITK v5.3rc04.post4 --- .github/workflows/build-test-cxx.yml | 2 +- .github/workflows/build-test-package-python.yml | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/build-test-cxx.yml b/.github/workflows/build-test-cxx.yml index 14e3982..b7687ce 100644 --- a/.github/workflows/build-test-cxx.yml +++ b/.github/workflows/build-test-cxx.yml @@ -15,7 +15,7 @@ on: itk-git-tag: required: false type: string - default: '171fb2ba33a87041f99328a2f26612ff33aa9cc8' + default: 'abf5fa10522a36bc51f42f20f426a622f42ed90d' jobs: build-test-cxx: diff --git a/.github/workflows/build-test-package-python.yml b/.github/workflows/build-test-package-python.yml index f843040..30a19f0 100644 --- a/.github/workflows/build-test-package-python.yml +++ b/.github/workflows/build-test-package-python.yml @@ -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 @@ -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 @@ -105,7 +105,7 @@ jobs: 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 From 15e20452c606a68be3e04d9c88ec1afa976b003d Mon Sep 17 00:00:00 2001 From: Tom Birdsong Date: Wed, 16 Nov 2022 15:39:15 -0500 Subject: [PATCH 2/4] ENH: Bump Windows runners to `windows-2022` Resolves compiler mismatch issue where ITK v5.3rc04.post4 build archives were built with VS22 compiler --- .github/workflows/build-test-cxx.yml | 16 ++++++++-------- .github/workflows/build-test-package-python.yml | 4 ++-- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/.github/workflows/build-test-cxx.yml b/.github/workflows/build-test-cxx.yml index b7687ce..6b27e6e 100644 --- a/.github/workflows/build-test-cxx.yml +++ b/.github/workflows/build-test-cxx.yml @@ -23,13 +23,13 @@ jobs: 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" @@ -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 @@ -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 @@ -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 diff --git a/.github/workflows/build-test-package-python.yml b/.github/workflows/build-test-package-python.yml index 30a19f0..158c7af 100644 --- a/.github/workflows/build-test-package-python.yml +++ b/.github/workflows/build-test-package-python.yml @@ -101,7 +101,7 @@ jobs: path: dist build-windows-python-packages: - runs-on: windows-2019 + runs-on: windows-2022 strategy: max-parallel: 2 matrix: @@ -137,7 +137,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 From 5ae6fb0846cb9e7b4d9aa073f7f91638f413c7e6 Mon Sep 17 00:00:00 2001 From: Tom Birdsong Date: Thu, 17 Nov 2022 11:28:35 -0500 Subject: [PATCH 3/4] ENH: Install unzstd dependency on Linux --- .github/workflows/build-test-package-python.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/.github/workflows/build-test-package-python.yml b/.github/workflows/build-test-package-python.yml index 158c7af..e12070d 100644 --- a/.github/workflows/build-test-package-python.yml +++ b/.github/workflows/build-test-package-python.yml @@ -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 From e892e8c410b602e2a7a3300dac8449de5b138229 Mon Sep 17 00:00:00 2001 From: Tom Birdsong Date: Thu, 17 Nov 2022 17:08:22 -0500 Subject: [PATCH 4/4] ENH: Bump CMake to v3.22.2 and Ninja to 1.10.2 Addresses Windows cxx build warnings due to MSVC discovery issues that were fixed in CMake v3.21.3. The closest available tag for the `lukka/get-cmake` action is v3.22.2, which also updates `ninja` to 1.10.2. https://gitlab.kitware.com/cmake/cmake/-/merge_requests/6497 https://github.com/lukka/get-cmake/releases/tag/v3.22.2 --- .github/workflows/build-test-cxx.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build-test-cxx.yml b/.github/workflows/build-test-cxx.yml index 6b27e6e..0001edb 100644 --- a/.github/workflows/build-test-cxx.yml +++ b/.github/workflows/build-test-cxx.yml @@ -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: |