From ce1e9ba85a1937ba695aab4da34bf310c5a8ecc9 Mon Sep 17 00:00:00 2001 From: NAHO <90870942+trueNAHO@users.noreply.github.com> Date: Fri, 27 Dec 2024 02:14:55 +0100 Subject: [PATCH] ci: lock macOS runner to macos-14 --- .github/workflows/ci.yml | 6 +++--- .mergify.yml | 4 ++-- doc/manual/source/development/testing.md | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 7592f60b9..cd567cd63 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -20,7 +20,7 @@ jobs: strategy: fail-fast: false matrix: - os: [ubuntu-24.04, macos-latest] + os: [ubuntu-24.04, macos-14] runs-on: ${{ matrix.os }} timeout-minutes: 60 steps: @@ -51,7 +51,7 @@ jobs: strategy: fail-fast: false matrix: - os: [ubuntu-24.04, macos-latest] + os: [ubuntu-24.04, macos-14] runs-on: ${{ matrix.os }} steps: - uses: actions/checkout@v4 @@ -70,7 +70,7 @@ jobs: - run: sudo apt install fish zsh if: matrix.os == 'ubuntu-24.04' - run: brew install fish - if: matrix.os == 'macos-latest' + if: matrix.os == 'macos-14' - run: exec bash -c "nix-instantiate -E 'builtins.currentTime' --eval" - run: exec sh -c "nix-instantiate -E 'builtins.currentTime' --eval" - run: exec zsh -c "nix-instantiate -E 'builtins.currentTime' --eval" diff --git a/.mergify.yml b/.mergify.yml index 827e97290..13d2002ea 100644 --- a/.mergify.yml +++ b/.mergify.yml @@ -2,9 +2,9 @@ queue_rules: - name: default # all required tests need to go here merge_conditions: - - check-success=tests (macos-latest) + - check-success=tests (macos-14) - check-success=tests (ubuntu-24.04) - - check-success=installer_test (macos-latest) + - check-success=installer_test (macos-14) - check-success=installer_test (ubuntu-24.04) - check-success=vm_tests batch_size: 5 diff --git a/doc/manual/source/development/testing.md b/doc/manual/source/development/testing.md index 082863bcc..d582ce4b4 100644 --- a/doc/manual/source/development/testing.md +++ b/doc/manual/source/development/testing.md @@ -297,7 +297,7 @@ Creating a Cachix cache for your installer tests and adding its authorisation to - `armv7l-linux` - `x86_64-darwin` -- The `installer_test` job (which runs on `ubuntu-24.04` and `macos-latest`) will try to install Nix with the cached installer and run a trivial Nix command. +- The `installer_test` job (which runs on `ubuntu-24.04` and `macos-14`) will try to install Nix with the cached installer and run a trivial Nix command. ### One-time setup