tweak caching and remove cabal freeze in ci

haskell-pkg-janitors · Mar 15, 2023 · 3d7b02c · 3d7b02c
1 parent 754ac02
commit 3d7b02c
Showing 1 changed file with 11 additions and 7 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -25,15 +25,12 @@ jobs:
       with:
         ghc-version: ${{ matrix.ghc }}
 
-    - name: Freeze
-      run: |
-        cabal freeze
-
-    - uses: actions/cache@v2
-      name: Cache ~/.cabal/store
+    - name: Restore cache
+      uses: actions/cache/restore@v3
       with:
+	key: ${{ runner.os }}-${{ matrix.ghc }}-${{ github.sha }}
         path: ${{ steps.setup-haskell-cabal.outputs.cabal-store }}
-        key: ${{ runner.os }}-${{ matrix.ghc }}-${{ hashFiles('cabal.project.freeze') }}
+	restore-keys: ${{ runner.os }}-${{ matrix.ghc }}-
 
     - name: Build
       run: |
@@ -43,3 +40,10 @@ jobs:
     - name: Test
       run: |
         cabal test all
+
+    - name: Save cache
+      uses: actions/cache/save@v3
+      if: always()
+      with:
+	key: ${{ runner.os }}-${{ matrix.ghc }}-${{ github.sha }}
+        path: ${{ steps.setup-haskell-cabal.outputs.cabal-store }}