From c11f6227091d5cb7f2f7ac9b4d2f87fbd391cf09 Mon Sep 17 00:00:00 2001 From: Johannes Schindelin Date: Wed, 2 Jul 2025 12:00:07 +0200 Subject: [PATCH 1/4] fixup! release: create initial Windows installer build workflow Switch from `windows-2019` to `windows-2022` as the former has been retired: https://github.com/actions/runner-images/issues/12045. Signed-off-by: Johannes Schindelin --- .github/workflows/build-git-installers.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build-git-installers.yml b/.github/workflows/build-git-installers.yml index b2ddb9ea61e97a..91789dfa0b8902 100644 --- a/.github/workflows/build-git-installers.yml +++ b/.github/workflows/build-git-installers.yml @@ -65,7 +65,7 @@ jobs: artifact: pkg-x86_64 toolchain: x86_64 mingwprefix: mingw64 - runner: windows-2019 + runner: windows-2022 - name: aarch64 artifact: pkg-aarch64 toolchain: clang-aarch64 @@ -192,7 +192,7 @@ jobs: artifact: pkg-x86_64 toolchain: x86_64 mingwprefix: mingw64 - runner: windows-2019 + runner: windows-2022 - name: aarch64 artifact: pkg-aarch64 toolchain: clang-aarch64 From 3710e3428e859f6f5f33b481a27d67b96f2e86a1 Mon Sep 17 00:00:00 2001 From: Johannes Schindelin Date: Wed, 2 Jul 2025 12:01:36 +0200 Subject: [PATCH 2/4] fixup! ci: run Scalar's Functional Tests Switch from `windows-2019` to `windows-2022` as the former has been retired: https://github.com/actions/runner-images/issues/12045. Signed-off-by: Johannes Schindelin --- .github/workflows/scalar-functional-tests.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/scalar-functional-tests.yml b/.github/workflows/scalar-functional-tests.yml index 2050d8ff7eb6aa..9dd8b241e515c6 100644 --- a/.github/workflows/scalar-functional-tests.yml +++ b/.github/workflows/scalar-functional-tests.yml @@ -20,7 +20,7 @@ jobs: fail-fast: false matrix: # Order by runtime (in descending order) - os: [windows-2019, macos-13, ubuntu-22.04] + os: [windows-2022, macos-13, ubuntu-22.04] # Scalar.NET used to be tested using `features: [false, experimental]` # But currently, Scalar/C ignores `feature.scalar` altogether, so let's # save some electrons and run only one of them... From d061fd93f32b5eb227f85dbf53cce021beaaa175 Mon Sep 17 00:00:00 2001 From: Johannes Schindelin Date: Wed, 2 Jul 2025 16:30:33 +0200 Subject: [PATCH 3/4] fixup! release: add Mac OSX installer build Apparently the macos-latest-xl-arm64 pool either does not exist anymore or is somehow broken. I just waited over 4h for a job to be started. Seeing as `macos-latest` is now ARM-based, let's see whether we can just use that pool instead. Signed-off-by: Johannes Schindelin --- .github/workflows/build-git-installers.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build-git-installers.yml b/.github/workflows/build-git-installers.yml index 91789dfa0b8902..402aae217d88b5 100644 --- a/.github/workflows/build-git-installers.yml +++ b/.github/workflows/build-git-installers.yml @@ -381,7 +381,7 @@ jobs: # Build and sign Mac OSX installers & upload artifacts create-macos-artifacts: - runs-on: macos-latest-xl-arm64 + runs-on: macos-latest needs: prereqs env: VERSION: "${{ needs.prereqs.outputs.tag_version }}" From dcb28180a0f5ee153d526aeb7fb62c1a1686e01e Mon Sep 17 00:00:00 2001 From: Johannes Schindelin Date: Wed, 2 Jul 2025 16:31:51 +0200 Subject: [PATCH 4/4] fixup! release: add installer validation Apparently the macos-latest-xl-arm64 pool either does not exist anymore or is somehow broken. I just waited over 4h for a job to be started. Seeing as `macos-latest` is now ARM-based, let's see whether we can just use that pool instead. Signed-off-by: Johannes Schindelin --- .github/workflows/build-git-installers.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build-git-installers.yml b/.github/workflows/build-git-installers.yml index 402aae217d88b5..fcdc0458902986 100644 --- a/.github/workflows/build-git-installers.yml +++ b/.github/workflows/build-git-installers.yml @@ -720,7 +720,7 @@ jobs: - os: ubuntu-latest artifact: linux-artifacts command: git - - os: macos-latest-xl-arm64 + - os: macos-latest artifact: macos-artifacts command: git - os: macos-latest