caching working!

Haskell-Things · Jan 28, 2024 · 9bc1f04 · 9bc1f04
1 parent 9dc726c
commit 9bc1f04
Showing 1 changed file with 11 additions and 15 deletions.
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
@@ -94,17 +94,6 @@ jobs:
         run: cabal build all --enable-tests --enable-benchmarks --only-dependencies
       - name: build all
         run: cabal build all --enable-tests --enable-benchmarks
-      - name: Save build artifacts
-        uses: "actions/cache/save@v4"
-        with:
-          key: "${{ runner.os }}-${{ matrix.ghc }}-cabal-${{ hashFiles('cabal.project.freeze') }}"
-          path: |
-            "${{ steps.setup-haskell-cabal.outputs.cabal-store }}"
-            ~/.cabal/packages
-            ~/.cabal/store
-            ~/.cabal/bin
-            dist-newstyle
-            ~/.local/bin
       - name: test all
         run: cabal test test-hslice --enable-tests
     strategy:
@@ -136,11 +125,18 @@ jobs:
           fi
       - name: freeze
         run: cabal freeze
-      - uses: "actions/cache/restore@v4"
+      - name: Restore build artifacts
+        uses: "actions/cache/restore@v4"
+        id: build-hslice-restore
         with:
-          key: "${{ runner.os }}-${{ matrix.ghc }}-build-cabal-${{ hashFiles('cabal.project.freeze') }}"
-          path: "${{ steps.setup-haskell-cabal.outputs.cabal-store }} dist-newstyle"
-          restore-keys: ${{ runner.os }}-${{ matrix.ghc }}-
+          key: "${{ runner.os }}-${{ matrix.ghc }}-cabal-${{ hashFiles('cabal.project.freeze') }}"
+          path: |
+            "${{ steps.setup-haskell-cabal.outputs.cabal-store }}"
+            ~/.cabal/packages
+            ~/.cabal/store
+            ~/.cabal/bin
+            dist-newstyle
+            ~/.local/bin
       - name: Install dependencies
         run: cabal build all --enable-tests --enable-benchmarks --only-dependencies
       - name: build all