Skip to content

Commit

Permalink
ci: update Ubuntu runner to ubuntu-24.04
Browse files Browse the repository at this point in the history
Link: actions/runner-images#10636
(cherry picked from commit b5f1065)

# Conflicts:
#	.github/workflows/ci.yml
#	.mergify.yml
  • Loading branch information
trueNAHO authored and mergify[bot] committed Jan 1, 2025
1 parent 154693c commit 06b9128
Show file tree
Hide file tree
Showing 4 changed files with 19 additions and 11 deletions.
20 changes: 12 additions & 8 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ permissions: read-all

jobs:
eval:
runs-on: ubuntu-22.04
runs-on: ubuntu-24.04
steps:
- uses: actions/checkout@v4
with:
Expand All @@ -21,7 +21,7 @@ jobs:
strategy:
fail-fast: false
matrix:
os: [ubuntu-22.04, macos-latest]
os: [ubuntu-24.04, macos-latest]
runs-on: ${{ matrix.os }}
timeout-minutes: 60
steps:
Expand All @@ -42,7 +42,7 @@ jobs:
# 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
- run: sudo sysctl -w kernel.apparmor_restrict_unprivileged_userns=0
if: matrix.os == 'ubuntu-22.04'
if: matrix.os == 'ubuntu-24.04'
- run: scripts/build-checks

# Steps to test CI automation in your own fork.
Expand Down Expand Up @@ -101,7 +101,7 @@ jobs:
strategy:
fail-fast: false
matrix:
os: [ubuntu-22.04, macos-latest]
os: [ubuntu-24.04, macos-latest]
runs-on: ${{ matrix.os }}
steps:
- uses: actions/checkout@v4
Expand All @@ -111,7 +111,7 @@ jobs:
install_url: '${{needs.installer.outputs.installerURL}}'
install_options: "--tarball-url-prefix https://${{ env.CACHIX_NAME }}.cachix.org/serve"
- run: sudo apt install fish zsh
if: matrix.os == 'ubuntu-22.04'
if: matrix.os == 'ubuntu-24.04'
- run: brew install fish
if: matrix.os == 'macos-latest'
- run: exec bash -c "nix-instantiate -E 'builtins.currentTime' --eval"
Expand All @@ -131,7 +131,7 @@ jobs:
permissions:
contents: none
name: Check Docker secrets present for installer tests
runs-on: ubuntu-22.04
runs-on: ubuntu-24.04
outputs:
docker: ${{ steps.secret.outputs.docker }}
steps:
Expand All @@ -157,8 +157,12 @@ jobs:
runs-on: ubuntu-latest
=======
github.ref_name == 'master'
<<<<<<< HEAD
runs-on: ubuntu-22.04
>>>>>>> fe5f02c2c (ci: lock Ubuntu runner to ubuntu-22.04)
=======
runs-on: ubuntu-24.04
>>>>>>> b5f10655e (ci: update Ubuntu runner to ubuntu-24.04)
steps:
- uses: actions/checkout@v4
with:
Expand Down Expand Up @@ -210,7 +214,7 @@ jobs:
docker push $IMAGE_ID:master
vm_tests:
runs-on: ubuntu-22.04
runs-on: ubuntu-24.04
steps:
- uses: actions/checkout@v4
- uses: DeterminateSystems/nix-installer-action@main
Expand All @@ -219,7 +223,7 @@ jobs:

flake_regressions:
needs: vm_tests
runs-on: ubuntu-22.04
runs-on: ubuntu-24.04
steps:
- name: Checkout nix
uses: actions/checkout@v4
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/labels.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ permissions:

jobs:
labels:
runs-on: ubuntu-22.04
runs-on: ubuntu-24.04
if: github.repository_owner == 'NixOS'
steps:
- uses: actions/labeler@v5
Expand Down
6 changes: 5 additions & 1 deletion .mergify.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,14 @@ queue_rules:
- check-success=tests (ubuntu-latest)
=======
- check-success=tests (macos-latest)
- check-success=tests (ubuntu-22.04)
- check-success=tests (ubuntu-24.04)
- check-success=installer_test (macos-latest)
<<<<<<< HEAD
- check-success=installer_test (ubuntu-22.04)
>>>>>>> fe5f02c2c (ci: lock Ubuntu runner to ubuntu-22.04)
=======
- check-success=installer_test (ubuntu-24.04)
>>>>>>> b5f10655e (ci: update Ubuntu runner to ubuntu-24.04)
- check-success=vm_tests
merge_method: rebase
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-22.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-latest`) will try to install Nix with the cached installer and run a trivial Nix command.

### One-time setup

Expand Down

0 comments on commit 06b9128

Please sign in to comment.