Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update Nix to 2.24.5 #1136

Merged
merged 3 commits into from
Sep 3, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/build-aarch64-linux.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ on:
jobs:
build-aarch64-linux:
name: Build aarch64 Linux (static)
runs-on: namespace-profile-default-arm64
runs-on: UbuntuLatest32Cores128GArm
concurrency: ${{ inputs.cache-key }}
permissions:
id-token: "write"
Expand Down
47 changes: 44 additions & 3 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
name: CI

on:
workflow_dispatch:
pull_request:
push:
branches: [main]
Expand All @@ -24,7 +25,7 @@ jobs:

lints:
name: Lints
runs-on: ubuntu-latest
runs-on: UbuntuLatest32Cores128G
permissions:
id-token: "write"
contents: "read"
Expand Down Expand Up @@ -57,7 +58,7 @@ jobs:

run-x86_64-linux:
name: Run x86_64 Linux
runs-on: ubuntu-latest
runs-on: UbuntuLatest32Cores128G
needs: [lints, build-x86_64-linux]
strategy:
matrix:
Expand Down Expand Up @@ -170,7 +171,7 @@ jobs:

run-x86_64-linux-no-init:
name: Run x86_64 Linux (No init)
runs-on: ubuntu-latest
runs-on: UbuntuLatest32Cores128G
needs: [lints, build-x86_64-linux]
strategy:
matrix:
Expand Down Expand Up @@ -575,3 +576,43 @@ jobs:
NIX_INSTALLER_LOGGER: pretty
NIX_INSTALLER_LOG_DIRECTIVES: nix_installer=debug
RUST_BACKTRACE: full

run-x86_64-linux-release-checks:
name: Run x86_64 Linux release checks
runs-on: UbuntuLatest64Cores256GX86
needs: [lints, build-x86_64-linux]
if: contains(github.ref, 'release-')
permissions:
id-token: "write"
contents: "read"
steps:
- uses: actions/checkout@v3
- name: Restore Github cache artifacts
uses: actions/cache/restore@v3
with:
path: nix-installer
key: x86_64-linux-artifacts-${{ github.sha }}
- name: Move & set executable
run: |
mkdir install-root
cp nix-installer.sh install-root/nix-installer.sh
mv ./nix-installer install-root/nix-installer-x86_64-linux
chmod +x install-root/nix-installer-x86_64-linux install-root/nix-installer.sh
- name: Initial install
uses: DeterminateSystems/nix-installer-action@main
with:
flakehub: true
local-root: install-root/
logger: pretty
log-directives: nix_installer=debug
backtrace: full
- uses: DeterminateSystems/magic-nix-cache-action@main
with:
use-gha-cache: false

- run: nix flake check -L
- run: |
nix build \
-L --tarball-ttl 0 --keep-going \
.#hydraJobs.container-test.all.x86_64-linux.all \
.#hydraJobs.vm-test.all.x86_64-linux.all
132 changes: 67 additions & 65 deletions flake.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion flake.nix
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
};

nix = {
url = "https://flakehub.com/f/DeterminateSystems/nix/=2.23.3.tar.gz";
url = "https://flakehub.com/f/DeterminateSystems/nix/=2.24.5.tar.gz";
# Omitting `inputs.nixpkgs.follows = "nixpkgs";` on purpose
};

Expand Down
Loading