Merge branch 'ci-cabal'

cabalism · May 22, 2024 · 71d6b35 · 71d6b35
2 parents 2b7d42e + bb3fca5
commit 71d6b35
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/.github/workflows/cabal.yml b/.github/workflows/cabal.yml
@@ -42,17 +42,18 @@ jobs:
     - name: Updo
       run: GHC_VERSION=${{ matrix.vers.ghc }} STACKAGE_VERSION=${{ matrix.vers.stackage }} make -f project-files.mk cabal.project
 
+    # Generate a file to cache dependencies.
     - name: Build dry run
       run: cabal build all --enable-tests --enable-benchmarks --dry-run
 
     - name: Restore cached dependencies
       uses: actions/cache/restore@v4
       id: cache
       env:
-        key: ${{ runner.os }}-ghc-${{ steps.setup.outputs.ghc-version }}-cabal-${{ steps.setup.outputs.cabal-version }}
+        key: ghc-${{ steps.setup.outputs.ghc-version }}-cabal-${{ steps.setup.outputs.cabal-version }}
       with:
         path: ${{ steps.setup.outputs.cabal-store }}
-        key: ${{ env.key }}-plan-${{ hashFiles('**/plan.json') }}
+        key: ${{ env.key }}-plan-${{ hashFiles('dist-newstyle/cache/plan.json') }}
         restore-keys: ${{ env.key }}-
 
     - name: Install dependencies