nordic-dev.net/nix
nordic-dev.net/nix
2
0
Fork 0
mirror of https://github.com/NixOS/nix.git synced 2025-02-01 01:23:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

.github/ci: Use fixed names

Browse Source 
This lets us update "runs-on" without creating a mismatch with the
required checks that are configured for the repo in the github ui.
This commit is contained in:
Robert Hensing 2024-12-31 17:24:36 +01:00 committed by Jörg Thalheim
parent a3522b4696
commit d910cab254
2 changed files with 25 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
.github/workflows/ci.yml vendored
View File

@ -20,8 +20,15 @@ jobs:
strategy: strategy:
fail-fast: false fail-fast: false
matrix: matrix:
os: [ubuntu-24.04, macos-14] include:
runs-on: ${{ matrix.os }} - scenario: on ubuntu
runs-on: ubuntu-24.04
os: linux
- scenario: on macos
runs-on: macos-14
os: darwin
name: tests ${{ matrix.scenario }}
runs-on: ${{ matrix.runs-on }}
timeout-minutes: 60 timeout-minutes: 60
steps: steps:
- uses: actions/checkout@v4 - uses: actions/checkout@v4
@ -37,7 +44,7 @@ jobs:
# Since ubuntu 22.30, unprivileged usernamespaces are no longer allowed to map to the root user: # Since ubuntu 22.30, unprivileged usernamespaces are no longer allowed to map to the root user:
# https://ubuntu.com/blog/ubuntu-23-10-restricted-unprivileged-user-namespaces # https://ubuntu.com/blog/ubuntu-23-10-restricted-unprivileged-user-namespaces
- run: sudo sysctl -w kernel.apparmor_restrict_unprivileged_userns=0 - run: sudo sysctl -w kernel.apparmor_restrict_unprivileged_userns=0
if: matrix.os == 'ubuntu-24.04' if: matrix.os == 'linux'
- run: scripts/build-checks - run: scripts/build-checks
- run: scripts/prepare-installer-for-github-actions - run: scripts/prepare-installer-for-github-actions
- name: Upload installer tarball - name: Upload installer tarball
@ -51,8 +58,15 @@ jobs:
strategy: strategy:
fail-fast: false fail-fast: false
matrix: matrix:
os: [ubuntu-24.04, macos-14] include:
runs-on: ${{ matrix.os }} - scenario: on ubuntu
runs-on: ubuntu-24.04
os: linux
- scenario: on macos
runs-on: macos-14
os: darwin
name: installer test ${{ matrix.scenario }}
runs-on: ${{ matrix.runs-on }}
steps: steps:
- uses: actions/checkout@v4 - uses: actions/checkout@v4
- name: Download installer tarball - name: Download installer tarball
@ -68,9 +82,9 @@ jobs:
install_url: 'http://localhost:8126/install' install_url: 'http://localhost:8126/install'
install_options: "--tarball-url-prefix http://localhost:8126/" install_options: "--tarball-url-prefix http://localhost:8126/"
- run: sudo apt install fish zsh - run: sudo apt install fish zsh
if: matrix.os == 'ubuntu-24.04' if: matrix.os == 'linux'
- run: brew install fish - run: brew install fish
if: matrix.os == 'macos-14' if: matrix.os == 'darwin'
- 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"

8
.mergify.yml
View File

@ -5,10 +5,10 @@ queue_rules:
- check-success=installer - check-success=installer
- check-success=installer_test (macos-latest) - check-success=installer_test (macos-latest)
- check-success=installer_test (ubuntu-latest) - check-success=installer_test (ubuntu-latest)
- check-success=tests (macos-14) - check-success=tests on macos
- check-success=tests (ubuntu-24.04) - check-success=tests on ubuntu
- check-success=installer_test (macos-14) - check-success=installer_test on macos
- check-success=installer_test (ubuntu-24.04) - check-success=installer_test on ubuntu
- check-success=vm_tests - check-success=vm_tests
merge_method: rebase merge_method: rebase
batch_size: 5 batch_size: 5