From a88dee790b7c70fbc0e19306d4f769259f4993e9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jon=20Haitz=20Legarreta=20Gorro=C3=B1o?= Date: Wed, 6 Nov 2024 17:10:04 -0500 Subject: [PATCH 1/4] ENH: Use specific XCode version for GHA macOS 13 build Use specific XCode version for GHA macOS 13 build. Left behind in commit 540f185. Fixes: ``` ld: warning: ignoring duplicate libraries: '-lm' ``` raised for example at: https://github.com/InsightSoftwareConsortium/ITKSphinxExamples/actions/runs/11685104025/job/32537789529#step:11:7623 --- .github/workflows/build-test-publish.yml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/.github/workflows/build-test-publish.yml b/.github/workflows/build-test-publish.yml index 97dfb66cf..65fd9bc72 100644 --- a/.github/workflows/build-test-publish.yml +++ b/.github/workflows/build-test-publish.yml @@ -44,6 +44,11 @@ jobs: - name: Get specific version of CMake, Ninja uses: lukka/get-cmake@v3.24.2 + - name: Specific XCode version + if: matrix.os == 'macos-13' + run: | + sudo xcode-select -s "/Applications/Xcode_14.3.1.app" + - name: Download ITK run: | cd .. From e7af6630111659c186e9510fc46983816dddef05 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jon=20Haitz=20Legarreta=20Gorro=C3=B1o?= Date: Wed, 6 Nov 2024 17:08:06 -0500 Subject: [PATCH 2/4] ENH: Bump macOS version for notebook build, test GHA action step Bump macOS version to 13 for notebook build, test GHA action step. Left behind in commit 540f185. --- .github/workflows/build-test-publish.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build-test-publish.yml b/.github/workflows/build-test-publish.yml index 65fd9bc72..298a71aa4 100644 --- a/.github/workflows/build-test-publish.yml +++ b/.github/workflows/build-test-publish.yml @@ -234,7 +234,7 @@ jobs: strategy: max-parallel: 3 matrix: - os: [ubuntu-22.04, windows-2022, macos-12] + os: [ubuntu-22.04, windows-2022, macos-13] steps: - uses: actions/checkout@v3 From 3df5ef36a1b631f05edd4d9843330558edabde7a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jon=20Haitz=20Legarreta=20Gorro=C3=B1o?= Date: Wed, 6 Nov 2024 16:58:55 -0500 Subject: [PATCH 3/4] ENH: Bump checkout and setup-python GitHub actions versions Bump checkout and setup-python GitHub actions versions. Fixes: ``` The following actions use a deprecated Node.js version and will be forced to run on node20: actions/checkout@v3, actions/setup-python@v4, lukka/get-cmake@v3.24.2. For more info: https://github.blog/changelog/2024-03-07-github-actions-all-actions-will-run-on-node20-instead-of-node16-by-default/ ``` raised for example at: https://github.com/InsightSoftwareConsortium/ITKSphinxExamples/actions/runs/11685104025/job/32537786966 --- .github/workflows/build-test-publish.yml | 16 ++++++++-------- .github/workflows/lint.yml | 4 ++-- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/.github/workflows/build-test-publish.yml b/.github/workflows/build-test-publish.yml index 298a71aa4..820918b91 100644 --- a/.github/workflows/build-test-publish.yml +++ b/.github/workflows/build-test-publish.yml @@ -27,12 +27,12 @@ jobs: cmake-build-type: "MinSizeRel" steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 with: path: Ex - name: Set up Python 3.9 - uses: actions/setup-python@v4 + uses: actions/setup-python@v5 with: python-version: 3.9 @@ -151,12 +151,12 @@ jobs: cmake-build-type: "MinSizeRel" steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 with: path: Ex - name: Set up Python 3.9 - uses: actions/setup-python@v4 + uses: actions/setup-python@v5 with: python-version: 3.9 @@ -237,9 +237,9 @@ jobs: os: [ubuntu-22.04, windows-2022, macos-13] steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Set up Python 3.9 - uses: actions/setup-python@v4 + uses: actions/setup-python@v5 with: python-version: 3.9 @@ -271,13 +271,13 @@ jobs: cmake-build-type: "Release" steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 with: path: Ex submodules: recursive - name: Set up Python 3.9 - uses: actions/setup-python@v4 + uses: actions/setup-python@v5 with: python-version: 3.9 diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index 14e528c14..e401e1a0a 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -7,7 +7,7 @@ jobs: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 with: # Full git history is needed to get a proper # list of changed files within `super-linter` @@ -17,7 +17,7 @@ jobs: uses: InsightSoftwareConsortium/ITKClangFormatLinterAction@master - name: Set up Python - uses: actions/setup-python@v4 + uses: actions/setup-python@v5 with: python-version: 3.9 From 38d345a5f08cc36a8837e16068fc5d84f426720c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jon=20Haitz=20Legarreta=20Gorro=C3=B1o?= Date: Wed, 6 Nov 2024 17:02:00 -0500 Subject: [PATCH 4/4] ENH: Bump super-linter GitHub action version Bump super-linter GitHub action version. --- .github/workflows/lint.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index e401e1a0a..88592bc39 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -22,7 +22,7 @@ jobs: python-version: 3.9 - name: Lint Python - uses: github/super-linter@v4 + uses: github/super-linter@v7 env: VALIDATE_ALL_CODEBASE: false VALIDATE_PYTHON_BLACK: true