From 03d4aa5f666ae527ea6f7b93f55aaaa07b72192f Mon Sep 17 00:00:00 2001
From: Luc Perkins <lucperkins@gmail.com>
Date: Sat, 18 May 2024 17:07:04 -0300
Subject: [PATCH] Fix naming issue

---
 .github/workflows/build.yaml          | 6 +++---
 .github/workflows/check-and-test.yaml | 6 ++++--
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index c5be325..3f3b885 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -9,7 +9,7 @@ jobs:
     runs-on: ${{ matrix.systems.runner }}
     env:
       CLOSURE_NAME: magic-nix-cache-${{ matrix.systems.system }}
-      CLOSURE_PATH: magic-nix-cache.closure.xz
+      ARCHIVE: magic-nix-cache.closure.xz
     strategy:
       matrix:
         systems:
@@ -40,12 +40,12 @@ jobs:
       - name: Build package and create closure
         run: |
           nix build .# -L --fallback && \
-            nix-store --export $(nix-store -qR ./result) | xz -9 > "${{ env.CLOSURE_PATH }}"
+            nix-store --export $(nix-store -qR ./result) | xz -9 > "${{ env.ARCHIVE }}"
 
       - name: Upload a Build Artifact
         uses: actions/upload-artifact@v3.1.2
         with:
           # Artifact name
           name: ${{ env.CLOSURE_NAME }}
-          path: ${{ env.CLOSURE_PATH }}
+          path: ${{ env.ARCHIVE }}
           retention-days: 1
diff --git a/.github/workflows/check-and-test.yaml b/.github/workflows/check-and-test.yaml
index c08c8c5..3a5bb6f 100644
--- a/.github/workflows/check-and-test.yaml
+++ b/.github/workflows/check-and-test.yaml
@@ -42,7 +42,8 @@ jobs:
     needs: build
     env:
       CLOSURE_NAME: magic-nix-cache-${{ matrix.systems.system }}
-      CLOSURE_PATH: magic-nix-cache.closure.xz
+      CLOSURE_PATH: magic-nix-cache
+      ARCHIVE: magic-nix-cache.closure.xz
     strategy:
       matrix:
         systems:
@@ -70,7 +71,8 @@ jobs:
       - name: Extract
         id: extract
         run: |
-          OUTPUT=$(cat ${{ env.CLOSURE_PATH }} | xz -d | nix-store --import)
+          ARTIFACT="${{ env.CLOSURE_PATH }}/${{ env.ARCHIVE }}"
+          OUTPUT=$(cat ${ARTIFACT} | xz -d | nix-store --import)
           MNC_BIN_PATH=$(echo "${OUTPUT}" | tail -n 1)
           MAGIC_NIX_CACHE="${MNC_BIN_PATH}/bin/magic-nix-cache"