From 7f30f9b4b31219407fb0d7a536da3fdcbf151727 Mon Sep 17 00:00:00 2001 From: Nathan Henrie Date: Fri, 15 Sep 2023 07:53:36 -0600 Subject: [PATCH 1/2] Revert "dev: try switching to determinate systems installer action" This reverts commit 2ed2dc758234f0ccdae47f7f0a007450858001e1. --- .github/workflows/ci.yaml | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 38f62cc..54089e9 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -7,10 +7,9 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v3 - - name: Install Nix - uses: DeterminateSystems/nix-installer-action@main + - uses: cachix/install-nix-action@v18 with: - extra-conf: "system-features = nixos-test benchmark big-parallel kvm" + extra_nix_config: "system-features = nixos-test benchmark big-parallel kvm" - run: nix build - run: nix build .#doc - run: nix fmt . -- --check @@ -19,10 +18,9 @@ jobs: runs-on: macos-11 steps: - uses: actions/checkout@v3 - - name: Install Nix - uses: DeterminateSystems/nix-installer-action@main + - uses: cachix/install-nix-action@v18 with: - extra-conf: "system-features = nixos-test benchmark big-parallel kvm" + extra_nix_config: "system-features = nixos-test benchmark big-parallel kvm" - run: nix build - run: nix build .#doc - run: nix fmt . -- --check From b76899f4c177fcf901e90704aa472f15d7c83cae Mon Sep 17 00:00:00 2001 From: Nathan Henrie Date: Fri, 15 Sep 2023 07:54:21 -0600 Subject: [PATCH 2/2] Update nix installer Fixes https://github.com/ryantm/agenix/issues/198 --- .github/workflows/ci.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 54089e9..b53a3f2 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -7,7 +7,7 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v3 - - uses: cachix/install-nix-action@v18 + - uses: cachix/install-nix-action@v22 with: extra_nix_config: "system-features = nixos-test benchmark big-parallel kvm" - run: nix build @@ -18,7 +18,7 @@ jobs: runs-on: macos-11 steps: - uses: actions/checkout@v3 - - uses: cachix/install-nix-action@v18 + - uses: cachix/install-nix-action@v22 with: extra_nix_config: "system-features = nixos-test benchmark big-parallel kvm" - run: nix build