fix: always restore cache after Nix install

This fixes cache restoration on Macs, but should harm anything on Linux either, so to keep the logic simple just do it after on both systems.
divnix · Jan 17, 2023 · 3f8d955 · 3f8d955
1 parent 1d591f6
commit 3f8d955
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 23 deletions.
diff --git a/discover/action.yml b/discover/action.yml
@@ -18,6 +18,16 @@ outputs:
 runs:
   using: "composite"
   steps:
+    - name: Install Nix
+      uses: nixbuild/nix-quick-install-action@v21
+      if: startsWith(runner.name, 'discovery') == false
+      with:
+        nix_conf: |
+          experimental-features = nix-command flakes
+          accept-flake-config = true
+          trusted-users = runner
+          access-tokens = github.com=${{ inputs.github_pat }}
+
     - name: Cache Nix Store
       id: cache-nix
       if: startsWith(runner.name, 'discovery') == false
@@ -32,17 +42,6 @@ runs:
           discovery-${{ runner.os }}-${{ runner.arch }}-${{ github.ref }}-
           discovery-${{ runner.os }}-${{ runner.arch }}-
 
-
-    - name: Install Nix
-      uses: nixbuild/nix-quick-install-action@v21
-      if: startsWith(runner.name, 'discovery') == false
-      with:
-        nix_conf: |
-          experimental-features = nix-command flakes
-          accept-flake-config = true
-          trusted-users = runner
-          access-tokens = github.com=${{ inputs.github_pat }}
-
     - name: Discover
       id: eval
       env:

diff --git a/run/action.yaml b/run/action.yaml
@@ -74,17 +74,6 @@ runs:
         sudo chmod 0600 ~/.ssh/known_hosts
       shell: bash
 
-    - name: Restore Cache & Discovery Results
-      id: restore-cache
-      if: inputs.discovery_ssh == 'none' && runner.os != 'macOS'
-      uses: divnix/[email protected]
-      with:
-        path: |
-          /nix
-          ~/.cache/nix
-          ~root/.cache/nix
-        key: discovery-${{ runner.os }}-${{ runner.arch }}-${{ github.ref }}-${{ github.sha }}
-
     - name: Install Nix
       uses: nixbuild/nix-quick-install-action@v21
       with:
@@ -98,7 +87,7 @@ runs:
 
     - name: Restore Cache & Discovery Results
       id: restore-cache-mac
-      if: inputs.discovery_ssh == 'none' && runner.os == 'macOS'
+      if: inputs.discovery_ssh == 'none'
       uses: divnix/[email protected]
       with:
         path: |