diff --git a/.github/workflows/build-test-cxx.yml b/.github/workflows/build-test-cxx.yml index 0001edb..6c008ff 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: 'abf5fa10522a36bc51f42f20f426a622f42ed90d' + default: 'v5.3.0' jobs: build-test-cxx: diff --git a/.github/workflows/build-test-package-python.yml b/.github/workflows/build-test-package-python.yml index e12070d..9ed35a6 100644 --- a/.github/workflows/build-test-package-python.yml +++ b/.github/workflows/build-test-package-python.yml @@ -10,7 +10,11 @@ on: itk-wheel-tag: required: false type: string - default: 'v5.3rc04.post4' + default: 'v5.3.0' + itk-python-package-tag: + required: false + type: string + default: '0f5effc39afbf7cb1ac5ab20faa0996ddb12b34d' # 5.3 patch secrets: pypi_password: required: false # Packages will not be uploaded to PyPI if not set @@ -43,7 +47,12 @@ jobs: - 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 + ITK_PYTHON_PACKAGE_GIT_TAG=${{ inputs.itk-python-package-tag }} + if [[ -z ${ITK_PYTHON_PACKAGE_GIT_TAG} ]]; then + ITK_PYTHON_PACKAGE_GIT_TAG="master" + fi + + curl -L https://raw.githubusercontent.com/InsightSoftwareConsortium/ITKPythonPackage/${ITK_PYTHON_PACKAGE_GIT_TAG}/scripts/dockcross-manylinux-download-cache-and-build-module-wheels.sh -O chmod u+x dockcross-manylinux-download-cache-and-build-module-wheels.sh - name: 'Build 🐍 Python 📦 package' @@ -81,11 +90,16 @@ jobs: sudo xcode-select -s "/Applications/Xcode_13.2.1.app" - name: Get specific version of CMake, Ninja - uses: lukka/get-cmake@v3.18.3 + uses: lukka/get-cmake@v3.22.2 - name: 'Fetch build script' run: | - curl -L https://raw.githubusercontent.com/InsightSoftwareConsortium/ITKPythonPackage/master/scripts/macpython-download-cache-and-build-module-wheels.sh -O + ITK_PYTHON_PACKAGE_GIT_TAG=${{ inputs.itk-python-package-tag }} + if [[ -z ${ITK_PYTHON_PACKAGE_GIT_TAG} ]]; then + ITK_PYTHON_PACKAGE_GIT_TAG="master" + fi + + curl -L https://raw.githubusercontent.com/InsightSoftwareConsortium/ITKPythonPackage/${ITK_PYTHON_PACKAGE_GIT_TAG}/scripts/macpython-download-cache-and-build-module-wheels.sh -O chmod u+x macpython-download-cache-and-build-module-wheels.sh - name: 'Build 🐍 Python 📦 package' @@ -115,7 +129,7 @@ jobs: steps: - name: Get specific version of CMake, Ninja - uses: lukka/get-cmake@v3.18.3 + uses: lukka/get-cmake@v3.22.2 - uses: actions/checkout@v2 with: @@ -139,6 +153,18 @@ jobs: curl -L "https://data.kitware.com/api/v1/file/5bbf87ba8d777f06b91f27d6/download/grep-win.zip" -o "grep-win.zip" 7z x grep-win.zip -o/c/P/grep -aoa -r + if [[ -n ${{ inputs.itk-python-package-tag }} ]]; then + echo "Updating ITKPythonPackage build scripts to ${{ inputs.itk-python-package-tag }}" + pushd /c/P/IPP + git remote add InsightSoftwareConsortium https://github.com/InsightSoftwareConsortium/ITKPythonPackage.git --tags + git fetch InsightSoftwareConsortium + git checkout ${{ inputs.itk-python-package-tag }} + git status + popd + else + echo "Using ITKPythonPackage scripts included with ITKPythonBuilds archive" + fi + - name: 'Build 🐍 Python 📦 package' shell: cmd run: | @@ -160,7 +186,7 @@ jobs: - build-linux-python-packages - build-macos-python-packages - build-windows-python-packages - runs-on: ubuntu-18.04 + runs-on: ubuntu-20.04 steps: - name: Download Python Packages