@@ -74,10 +74,12 @@ jobs:
7474 with :
7575 path : |
7676 ~/.ghcup
77- ~/.stack
77+ ~/.stack/programs
78+ ~/.stack/pantry
7879 key : ${{ runner.os }}-haskell-${{ env.GHC_VERSION }}-stack-latest
7980 restore-keys : |
8081 ${{ runner.os }}-haskell-${{ env.GHC_VERSION }}-
82+ ${{ runner.os }}-haskell-
8183
8284 - name : 🏗 Setup Haskell
8385 if : runner.os == 'macOS'
@@ -344,6 +346,8 @@ jobs:
344346 with :
345347 path : ~/.ghc-wasm
346348 key : ghc-wasm-${{ env.CI_CACHE_KEY }}
349+ restore-keys : |
350+ ghc-wasm-${{ runner.os }}-${{ runner.arch }}-
347351
348352 - name : Try to restore cached native cabal
349353 id : native-cabal-cache-restore
@@ -353,15 +357,17 @@ jobs:
353357 ~/.config/cabal
354358 ~/.cache/cabal
355359 key : native-cabal-${{ env.CI_CACHE_KEY }}
360+ restore-keys : |
361+ native-cabal-${{ runner.os }}-${{ runner.arch }}-
356362
357363 - name : Try to restore cached dist-newstyle
358364 id : dist-newstyle-cache-restore
359365 uses : actions/cache/restore@v4
360366 with :
361367 path : als/dist-newstyle
362- key : dist-newstyle-${{ env.CI_CACHE_KEY }}-${{ hashFiles('als/dist-newstyle/**') }}
368+ key : dist-newstyle-${{ env.CI_CACHE_KEY }}
363369 restore-keys : |
364- dist-newstyle-${{ env.CI_CACHE_KEY }}-
370+ dist-newstyle-${{ runner.os }}-${{ runner.arch }}-
365371
366372 - name : Clone and setup ghc-wasm-meta
367373 id : ghc-wasm-setup
@@ -407,7 +413,7 @@ jobs:
407413 if : steps.build-dep-agda.outcome == 'success'
408414 with :
409415 path : als/dist-newstyle
410- key : dist-newstyle-${{ env.CI_CACHE_KEY }}-${{ hashFiles('als/dist-newstyle/**') }}
416+ key : dist-newstyle-${{ env.CI_CACHE_KEY }}
411417
412418 - name : Build dependencies other than Agda
413419 working-directory : ' ./als'
0 commit comments