Skip to content

Commit

Permalink
ci: lock macOS runner to macos-14
Browse files Browse the repository at this point in the history
  • Loading branch information
trueNAHO committed Dec 28, 2024
1 parent b5f1065 commit ce1e9ba
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 6 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down Expand Up @@ -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
Expand All @@ -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"
Expand Down
4 changes: 2 additions & 2 deletions .mergify.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion doc/manual/source/development/testing.md
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down

0 comments on commit ce1e9ba

Please sign in to comment.