From 89a1d348b518e094b54b04eee745206d83573ad8 Mon Sep 17 00:00:00 2001 From: Matt McCormick Date: Mon, 9 Dec 2024 15:12:23 -0500 Subject: [PATCH 1/2] WIP: ENH: CI builds against ITK 6.0 Alpha 1 The minimum Python version is not 3.9 because Python 3.8 is end-of-life. --- .github/workflows/build-test-package.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/build-test-package.yml b/.github/workflows/build-test-package.yml index 63b318f..03e0ed8 100644 --- a/.github/workflows/build-test-package.yml +++ b/.github/workflows/build-test-package.yml @@ -12,13 +12,13 @@ on: jobs: cxx-build-workflow: - uses: InsightSoftwareConsortium/ITKRemoteModuleBuildTestPackageAction/.github/workflows/build-test-cxx.yml@v5.4.0 + uses: thewtex/ITKRemoteModuleBuildTestPackageAction/.github/workflows/build-test-cxx.yml@itk-v6.0a01 python-build-workflow-dev: if: github.ref != 'refs/heads/master' && github.ref != 'refs/heads/main' && !startsWith(github.ref, 'refs/tags') - uses: InsightSoftwareConsortium/ITKRemoteModuleBuildTestPackageAction/.github/workflows/build-test-package-python.yml@v5.4.0 + uses: thewtex/ITKRemoteModuleBuildTestPackageAction/.github/workflows/build-test-package-python.yml@itk-v6.0a01 with: - python3-minor-versions: '["8","11"]' + python3-minor-versions: '["9","11"]' manylinux-platforms: '["_2_28-x64","2014-x64","_2_28-aarch64"]' test-notebooks: true secrets: @@ -26,9 +26,9 @@ jobs: python-build-workflow-main: if: github.ref == 'refs/heads/master' || github.ref == 'refs/heads/main' || startsWith(github.ref, 'refs/tags') - uses: InsightSoftwareConsortium/ITKRemoteModuleBuildTestPackageAction/.github/workflows/build-test-package-python.yml@v5.4.0 + uses: thewtex/ITKRemoteModuleBuildTestPackageAction/.github/workflows/build-test-package-python.yml@itk-v6.0a01 with: - python3-minor-versions: '["8","9","10","11"]' + python3-minor-versions: '["9","10","11"]' manylinux-platforms: '["_2_28-x64","2014-x64","_2_28-aarch64"]' test-notebooks: true secrets: From f72b2b994b6044d0ad417f83ee6f04212e2fdc86 Mon Sep 17 00:00:00 2001 From: Matt McCormick Date: Tue, 10 Dec 2024 09:51:01 -0500 Subject: [PATCH 2/2] COMP: Bump elastix to ITKElastix-2024-12-10-f928159ed6c2 Current `main` + wasm patches. For compatibility with ITK 6. --- CMakeLists.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 21129d4..2e86e93 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -62,8 +62,8 @@ endif() # set(elastix_GIT_REPOSITORY "https://github.com/SuperElastix/elastix.git") set(elastix_GIT_REPOSITORY "https://github.com/thewtex/elastix.git") # Upstream + wasm patches -# Branch: ITKElastix-2024-07-18-ebb429a33b -set(elastix_GIT_TAG "0ab3f57a6528cce609feedeb1650e7c850beca94") +# Branch: ITKElastix-2024-12-10-f928159ed6c2 +set(elastix_GIT_TAG "8b219cd45d06bd5b20df71de3b5f88a5ef8ddd66") FetchContent_Declare( elx GIT_REPOSITORY ${elastix_GIT_REPOSITORY}