Attempt caching dist-newstyle.

fossas · Oct 4, 2023 · a555253 · a555253
1 parent 9160c76
commit a555253
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 3 deletions.
diff --git a/.github/workflows/bench.yml b/.github/workflows/bench.yml
@@ -53,7 +53,9 @@ jobs:
     - uses: actions/cache@v3
       name: Cache cabal store
       with:
-        path: ${{ steps.setup-haskell.outputs.cabal-store || '~/.cabal/store' }}
+        path:
+          - ${{ steps.setup-haskell.outputs.cabal-store || '~/.cabal/store' }}
+          - 'dist-newstyle/'
         key: ${{ runner.os }}-benchmarks-cabal-cache-${{ hashFiles('**/*.cabal', 'cabal.project.ci.linux') }}
         restore-keys: |
           ${{ runner.os }}-benchmarks-cabal-cache-

diff --git a/.github/workflows/build-all.yml b/.github/workflows/build-all.yml
@@ -101,7 +101,9 @@ jobs:
     - uses: actions/cache@v3
       name: Cache cabal store
       with:
-        path: ${{ steps.setup-haskell.outputs.cabal-store || '~/.cabal/store' }}
+        path:
+          - ${{ steps.setup-haskell.outputs.cabal-store || '~/.cabal/store' }}
+          - 'dist-newstyle/'
         key: ${{ runner.os }}-${{ matrix.ghc }}-cabal-cache-${{ hashFiles('**/*.cabal', format('{0}', matrix.project-file)) }}
         restore-keys: |
           ${{ runner.os }}-${{ matrix.ghc }}-cabal-cache-

diff --git a/.github/workflows/integrations-test.yml b/.github/workflows/integrations-test.yml
@@ -65,7 +65,9 @@ jobs:
     - uses: actions/cache@v3
       name: Cache cabal store
       with:
-        path: ${{ steps.setup-haskell.outputs.cabal-store || '~/.cabal/store' }}
+        path:
+          - ${{ steps.setup-haskell.outputs.cabal-store || '~/.cabal/store' }}
+          - 'dist-newstyle/'
         key: ${{ runner.os }}-${{ env.GHC_VERSION }}-cabal-cache-${{ hashFiles('**/*.cabal', 'cabal.project.ci.linux') }}
         restore-keys: |
           ${{ runner.os }}-${{ env.GHC_VERSION }}-cabal-cache-

diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
@@ -91,6 +91,10 @@ jobs:
         run: |
           sed -i '/ghc-options: -Werror/d' cabal.project.ci.linux
 
+      path:
+        - ${{ steps.setup-haskell.outputs.cabal-store || '~/.cabal/store' }}
+        - 'dist-newstyle/'
+
       # Run `cabal install`.
       - uses: actions/cache@v3
         name: Cache cabal store