Skip to content

Commit 90baa65

Browse files
committed
Restore uniqueness of GHA cache names per configuration
And make sure to hash all configuration files (like `*.cabal*` and `cabal.project*`) correctly, and include those hahses in the GHA cache names too.
1 parent 637fec5 commit 90baa65

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

.github/workflows/haskell.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -93,10 +93,10 @@ jobs:
9393
cache-name: cache-cabal-build-130824
9494
with:
9595
path: ${{ steps.setup-haskell.outputs.cabal-store }}
96-
key: ${{ runner.os }}-${{ matrix.ghc }}-${{ env.cache-name }}-${{ hashFiles('**/*.cabal') }}-${{ hashFiles('**/cabal.project') }}-${{ hashFiles('**/cabal.project.debug') }}
96+
key: ${{ runner.os }}-${{ matrix.ghc }}-${{ env.cache-name }}-${{ hashFiles('*.cabal') }}-${{ hashFiles('cabal.project*') }}-${{ matrix.cabal-project-file }}
9797
restore-keys: |
98-
${{ runner.os }}-${{ matrix.ghc }}-${{ env.cache-name }}-${{ hashFiles('**/*.cabal') }}-${{ hashFiles('**/cabal.project') }}-
99-
${{ runner.os }}-${{ matrix.ghc }}-${{ env.cache-name }}-${{ hashFiles('**/*.cabal') }}-
98+
${{ runner.os }}-${{ matrix.ghc }}-${{ env.cache-name }}-${{ hashFiles('*.cabal') }}-${{ hashFiles('cabal.project*') }}
99+
${{ runner.os }}-${{ matrix.ghc }}-${{ env.cache-name }}-${{ hashFiles('*.cabal') }}-
100100
${{ runner.os }}-${{ matrix.ghc }}-${{ env.cache-name }}-
101101
102102
- name: Install cabal dependencies

0 commit comments

Comments
 (0)