Skip to content

Commit b2fe57e

Browse files
committed
remove deprecated save-always from CI cache
1 parent 31d4b2a commit b2fe57e

File tree

1 file changed

+11
-2
lines changed

1 file changed

+11
-2
lines changed

.github/workflows/cabal-ci.yaml

+11-2
Original file line numberDiff line numberDiff line change
@@ -57,14 +57,14 @@ jobs:
5757
5858
# Restore dist-newstyle
5959
- name: Cache dist-newstyle
60+
id: dist-cache-restore
6061
uses: actions/cache@v4
6162
with:
6263
path: |
6364
dist-newstyle
6465
key: dist-${{ matrix.os }}-${{ matrix.ghc }}-${{ hashFiles('**/*.cabal', '**/cabal.project', '**/cabal.project.local') }}
6566
restore-keys: |
6667
dist-${{ matrix.os }}-${{ matrix.ghc }}-
67-
save-always: true
6868
6969
# Build
7070
- name: Update package database
@@ -85,7 +85,7 @@ jobs:
8585
# Save packages
8686
- name: Save cache for ~/.cabal/packages and ~/.cabal/store
8787
uses: actions/cache/save@v4
88-
if: always()
88+
if: always() && steps.deps-cache-restore.outputs.cache-hit != 'true'
8989
with:
9090
path: |
9191
~/.cabal/packages
@@ -99,3 +99,12 @@ jobs:
9999
- name: Run Tests
100100
run: cabal test
101101

102+
# Safe dist
103+
- name: Save cache dist-newstyle
104+
uses: actions/cache/save@v4
105+
if: always() && steps.dist-cache-restore.outputs.cache-hit != 'true'
106+
with:
107+
path: |
108+
dist-newstyle
109+
key: ${{ steps.dist-cache-restore.outputs.cache-primary-key }}
110+

0 commit comments

Comments
 (0)