wroclaw-git-backups/nix
1
0
Fork 0
mirror of https://github.com/NixOS/nix synced 2025-06-25 10:41:16 +02:00
Code Activity

ci: lock macOS runner to macos-14

Browse source
This commit is contained in:
NAHO 2024-12-27 02:14:55 +01:00
parent b5f10655ed
commit ce1e9ba85a
No known key found for this signature in database
GPG key ID: 229CB671D09B95F5
3 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

6
.github/workflows/ci.yml vendored
View file

@ -20,7 +20,7 @@ jobs:
strategy: strategy:
fail-fast: false fail-fast: false
matrix: matrix:
os: [ubuntu-24.04, macos-latest] os: [ubuntu-24.04, macos-14]
runs-on: ${{ matrix.os }} runs-on: ${{ matrix.os }}
timeout-minutes: 60 timeout-minutes: 60
steps: steps:
@ -51,7 +51,7 @@ jobs:
strategy: strategy:
fail-fast: false fail-fast: false
matrix: matrix:
os: [ubuntu-24.04, macos-latest] os: [ubuntu-24.04, macos-14]
runs-on: ${{ matrix.os }} runs-on: ${{ matrix.os }}
steps: steps:
- uses: actions/checkout@v4 - uses: actions/checkout@v4
@ -70,7 +70,7 @@ jobs:
- run: sudo apt install fish zsh - run: sudo apt install fish zsh
if: matrix.os == 'ubuntu-24.04' if: matrix.os == 'ubuntu-24.04'
- run: brew install fish - 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 bash -c "nix-instantiate -E 'builtins.currentTime' --eval"
- run: exec sh -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" - run: exec zsh -c "nix-instantiate -E 'builtins.currentTime' --eval"

4
.mergify.yml
View file

@ -2,9 +2,9 @@ queue_rules:
- name: default - name: default
# all required tests need to go here # all required tests need to go here
merge_conditions: merge_conditions:
- check-success=tests (macos-latest) - check-success=tests (macos-14)
- check-success=tests (ubuntu-24.04) - 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=installer_test (ubuntu-24.04)
- check-success=vm_tests - check-success=vm_tests
batch_size: 5 batch_size: 5

2
doc/manual/source/development/testing.md
View file

@ -297,7 +297,7 @@ Creating a Cachix cache for your installer tests and adding its authorisation to
- `armv7l-linux` - `armv7l-linux`
- `x86_64-darwin` - `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 ### One-time setup