From 6b7860826ee37c9eb75e0b3e2661a4acb06c6596 Mon Sep 17 00:00:00 2001 From: Luc Perkins Date: Thu, 2 May 2024 13:47:23 -0300 Subject: [PATCH 1/5] Remove reinstall setting --- .github/workflows/ci.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 07b3ffa..cd142c6 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -172,13 +172,15 @@ jobs: if: success() || failure() run: | pkill magic-nix-cache + - name: Uninstall Nix + run: | + /nix/nix-installer uninstall --no-confirm - name: Reinstall Nix uses: ./ with: logger: pretty log-directives: nix_installer=trace backtrace: full - reinstall: true extra-conf: | use-sqlite-wal = true - name: Test `nix` with `$GITHUB_PATH` -- 2.44.1 From 3785eaaa9b5fa747cc750eafcccc6e724c86e7cb Mon Sep 17 00:00:00 2001 From: Luc Perkins Date: Thu, 2 May 2024 13:48:27 -0300 Subject: [PATCH 2/5] Fix other instance of uninstall/reinstall --- .github/workflows/ci.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index cd142c6..e6dbf2f 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -88,6 +88,9 @@ jobs: hello nix store gc nix run nixpkgs#hello + - name: Uninstall Nix + run: | + /nix/nix-installer uninstall --no-confirm - name: Reinstall Nix uses: ./ with: -- 2.44.1 From 23ddac323e514704d36c8945869cfa6f09c57a50 Mon Sep 17 00:00:00 2001 From: Luc Perkins Date: Thu, 2 May 2024 13:49:22 -0300 Subject: [PATCH 3/5] Remove second reinstall setting --- .github/workflows/ci.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index e6dbf2f..9ddabc5 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -97,7 +97,6 @@ jobs: logger: pretty log-directives: nix_installer=trace backtrace: full - reinstall: true extra-conf: | use-sqlite-wal = true - name: Test `nix` with `$GITHUB_PATH` -- 2.44.1 From f95752164330c16e028883632a7274db3dac9c12 Mon Sep 17 00:00:00 2001 From: Luc Perkins Date: Thu, 2 May 2024 13:54:44 -0300 Subject: [PATCH 4/5] Reinstate the MNC prior to reinstall --- .github/workflows/ci.yml | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 9ddabc5..77953ed 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -88,15 +88,13 @@ jobs: hello nix store gc nix run nixpkgs#hello - - name: Uninstall Nix - run: | - /nix/nix-installer uninstall --no-confirm - name: Reinstall Nix uses: ./ with: logger: pretty log-directives: nix_installer=trace backtrace: full + reinstall: true extra-conf: | use-sqlite-wal = true - name: Test `nix` with `$GITHUB_PATH` @@ -174,15 +172,15 @@ jobs: if: success() || failure() run: | pkill magic-nix-cache - - name: Uninstall Nix - run: | - /nix/nix-installer uninstall --no-confirm + # Reinstate the MNC + - uses: DeterminateSystems/magic-nix-cache-action@main - name: Reinstall Nix uses: ./ with: logger: pretty log-directives: nix_installer=trace backtrace: full + reinstall: true extra-conf: | use-sqlite-wal = true - name: Test `nix` with `$GITHUB_PATH` -- 2.44.1 From ff2ea37e976abaceab73fc46b55effe63e3e0204 Mon Sep 17 00:00:00 2001 From: Luc Perkins Date: Thu, 2 May 2024 13:58:19 -0300 Subject: [PATCH 5/5] Remove MNC from workflow --- .github/workflows/ci.yml | 8 -------- 1 file changed, 8 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 77953ed..0a5cc38 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -48,7 +48,6 @@ jobs: logger: pretty log-directives: nix_installer=trace backtrace: full - - uses: DeterminateSystems/magic-nix-cache-action@main - name: echo $PATH run: echo $PATH @@ -131,7 +130,6 @@ jobs: logger: pretty log-directives: nix_installer=trace backtrace: full - - uses: DeterminateSystems/magic-nix-cache-action@main - name: echo $PATH run: echo $PATH - name: Test `nix` with `$GITHUB_PATH` @@ -168,12 +166,6 @@ jobs: hello nix store gc nix run nixpkgs#hello - - name: Terminate the magic nix cache pre-reinstall - if: success() || failure() - run: | - pkill magic-nix-cache - # Reinstate the MNC - - uses: DeterminateSystems/magic-nix-cache-action@main - name: Reinstall Nix uses: ./ with: -- 2.44.1