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..0fe61ae9 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: @@ -14,7 +15,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 +31,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 +49,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 +64,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 +79,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 +95,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..beb2d4af 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: @@ -14,7 +16,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