From f3825a3ff84ed0eef83c77b5f11a6914df0d36d2 Mon Sep 17 00:00:00 2001 From: Ilka Schulz Date: Mon, 22 Jun 2026 12:59:27 +0200 Subject: [PATCH 1/3] upgrade Mac OS version from 13 to 26 on CI runners --- .github/workflows/integration.yml | 2 +- .github/workflows/nix-mac.yaml | 12 ++++++------ .github/workflows/qc-mac.yaml | 2 +- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.github/workflows/integration.yml b/.github/workflows/integration.yml index 83857121..87c2dc0c 100644 --- a/.github/workflows/integration.yml +++ b/.github/workflows/integration.yml @@ -126,7 +126,7 @@ jobs: # THE FOLLOWING TEST IS DISABLED FOR THE TIME BENG UNTIL THIS ISSUE WITH NIXOS TESTS ON DARWIN GETS RESOLVED: https://github.com/NixOS/nixpkgs/issues/294725 #integration-tests-aarch64-darwin: # name: Integration tests aarch64-darwin - # runs-on: warp-macos-13-arm64-6x + # runs-on: warp-macos-26-arm64-6x # steps: # - uses: actions/checkout@v7 # - uses: cachix/install-nix-action@v30 diff --git a/.github/workflows/nix-mac.yaml b/.github/workflows/nix-mac.yaml index 5152d429..52bbe2c6 100644 --- a/.github/workflows/nix-mac.yaml +++ b/.github/workflows/nix-mac.yaml @@ -14,7 +14,7 @@ concurrency: jobs: aarch64-darwin---default: name: Build aarch64-darwin.default - runs-on: warp-macos-13-arm64-6x + runs-on: warp-macos-26-arm64-6x needs: - aarch64-darwin---rosenpass steps: @@ -30,7 +30,7 @@ jobs: run: nix build .#packages.aarch64-darwin.default --print-build-logs aarch64-darwin---release-package: name: Build aarch64-darwin.release-package - runs-on: warp-macos-13-arm64-6x + runs-on: warp-macos-26-arm64-6x needs: - aarch64-darwin---rosenpass - aarch64-darwin---rp @@ -48,7 +48,7 @@ jobs: run: nix build .#packages.aarch64-darwin.release-package --print-build-logs aarch64-darwin---rosenpass: name: Build aarch64-darwin.rosenpass - runs-on: warp-macos-13-arm64-6x + runs-on: warp-macos-26-arm64-6x needs: [] steps: - uses: actions/checkout@v7 @@ -63,7 +63,7 @@ jobs: run: nix build .#packages.aarch64-darwin.rosenpass --print-build-logs aarch64-darwin---rp: name: Build aarch64-darwin.rp - runs-on: warp-macos-13-arm64-6x + runs-on: warp-macos-26-arm64-6x needs: [] steps: - uses: actions/checkout@v7 @@ -78,7 +78,7 @@ jobs: run: nix build .#packages.aarch64-darwin.rp --print-build-logs aarch64-darwin---rosenpass-oci-image: name: Build aarch64-darwin.rosenpass-oci-image - runs-on: warp-macos-13-arm64-6x + runs-on: warp-macos-26-arm64-6x needs: - aarch64-darwin---rosenpass steps: @@ -94,7 +94,7 @@ jobs: run: nix build .#packages.aarch64-darwin.rosenpass-oci-image --print-build-logs aarch64-darwin---check: name: Run Nix checks on aarch64-darwin - runs-on: warp-macos-13-arm64-6x + runs-on: warp-macos-26-arm64-6x steps: - uses: actions/checkout@v7 - uses: cachix/install-nix-action@v30 diff --git a/.github/workflows/qc-mac.yaml b/.github/workflows/qc-mac.yaml index 743c0121..f988b882 100644 --- a/.github/workflows/qc-mac.yaml +++ b/.github/workflows/qc-mac.yaml @@ -14,7 +14,7 @@ permissions: jobs: cargo-test-mac: - runs-on: warp-macos-13-arm64-6x + runs-on: warp-macos-26-arm64-6x steps: - uses: actions/checkout@v7 - uses: actions/cache@v5 From c423a4329d0b58545f02fe6fabe42dd1ed170493 Mon Sep 17 00:00:00 2001 From: Ilka Schulz Date: Mon, 22 Jun 2026 13:01:50 +0200 Subject: [PATCH 2/3] run Mac OS jobs on branch `upgrade-ci-macos` --- .github/workflows/nix-mac.yaml | 1 + .github/workflows/qc-mac.yaml | 4 +++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/.github/workflows/nix-mac.yaml b/.github/workflows/nix-mac.yaml index 52bbe2c6..691bfebc 100644 --- a/.github/workflows/nix-mac.yaml +++ b/.github/workflows/nix-mac.yaml @@ -5,6 +5,7 @@ on: push: branches: - main + - upgrade-ci-macos workflow_call: concurrency: diff --git a/.github/workflows/qc-mac.yaml b/.github/workflows/qc-mac.yaml index f988b882..85741a7e 100644 --- a/.github/workflows/qc-mac.yaml +++ b/.github/workflows/qc-mac.yaml @@ -1,7 +1,9 @@ name: QC Mac on: push: - branches: [main] + branches: + - main + - upgrade-ci-macos workflow_call: concurrency: From 5b78e996a2389b3db19aa0e66b874dbbce8b85b7 Mon Sep 17 00:00:00 2001 From: Ilka Schulz Date: Mon, 22 Jun 2026 13:11:56 +0200 Subject: [PATCH 3/3] revert last commit: only run Mac OS CI jobs on main as it was before --- .github/workflows/nix-mac.yaml | 2 +- .github/workflows/qc-mac.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/nix-mac.yaml b/.github/workflows/nix-mac.yaml index 691bfebc..0fe61ae9 100644 --- a/.github/workflows/nix-mac.yaml +++ b/.github/workflows/nix-mac.yaml @@ -5,7 +5,7 @@ on: push: branches: - main - - upgrade-ci-macos + # - upgrade-ci-macos workflow_call: concurrency: diff --git a/.github/workflows/qc-mac.yaml b/.github/workflows/qc-mac.yaml index 85741a7e..beb2d4af 100644 --- a/.github/workflows/qc-mac.yaml +++ b/.github/workflows/qc-mac.yaml @@ -3,7 +3,7 @@ on: push: branches: - main - - upgrade-ci-macos + # - upgrade-ci-macos workflow_call: concurrency: