diff --git a/.github/workflows/bench.yml b/.github/workflows/bench.yml index 0995fb2536..dc7400756c 100644 --- 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 index fd7b2bf77a..4dc6edd033 100644 --- 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 index 0cbedd97d9..335fb5e1e5 100644 --- 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 index eb80186ae9..eaa88c90a3 100644 --- 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