Skip to content

Commit 169ac05

Browse files
authored
Merge pull request #25 from flip111/github-workflow
Updated GitHub Actions workflow
2 parents 920fcac + 0373766 commit 169ac05

1 file changed

Lines changed: 14 additions & 12 deletions

File tree

.github/workflows/haskell-ci.yml

Lines changed: 14 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ jobs:
2121
- os: macOS-latest
2222
ghc: 'latest'
2323
steps:
24-
- uses: actions/checkout@v3
24+
- uses: actions/checkout@v4
2525
- name: Install libncurses5 and libtinfo
2626
if: runner.os == 'Linux' && (matrix.ghc == '8.0' || matrix.ghc == '8.2')
2727
run: |
@@ -30,15 +30,16 @@ jobs:
3030
id: setup-haskell-cabal
3131
with:
3232
ghc-version: ${{ matrix.ghc }}
33-
- name: Update cabal package database
34-
run: cabal update
35-
- uses: actions/cache@v2
33+
cabal-update: true # This runs 'cabal update' automatically
34+
- uses: actions/cache@v4
3635
name: Cache cabal stuff
3736
with:
3837
path: |
3938
${{ steps.setup-haskell-cabal.outputs.cabal-store }}
4039
dist-newstyle
41-
key: ${{ runner.os }}-${{ matrix.ghc }}
40+
key: ${{ runner.os }}-${{ matrix.ghc }}-${{ hashFiles('**/*.cabal', 'cabal.project') }}
41+
restore-keys: |
42+
${{ runner.os }}-${{ matrix.ghc }}-
4243
- name: Test
4344
run: |
4445
cabal sdist -z -o .
@@ -59,19 +60,20 @@ jobs:
5960
needs: build
6061
runs-on: ubuntu-latest
6162
steps:
62-
- uses: actions/checkout@v3
63-
- uses: haskell/actions/setup@v2
63+
- uses: actions/checkout@v4
64+
- uses: haskell-actions/setup@v2
6465
id: setup-haskell-cabal
6566
with:
6667
ghc-version: 'latest'
67-
- name: Update cabal package database
68-
run: cabal update
69-
- uses: actions/cache@v2
68+
cabal-update: true
69+
- uses: actions/cache@v4
7070
name: Cache cabal stuff
7171
with:
7272
path: |
7373
${{ steps.setup-haskell-cabal.outputs.cabal-store }}
7474
dist-newstyle
75-
key: ${{ runner.os }}-latest
75+
key: ${{ runner.os }}-latest-${{ hashFiles('**/*.cabal', 'cabal.project') }}
76+
restore-keys: |
77+
${{ runner.os }}-latest-
7678
- name: Test
77-
run: cabal test --ghc-options='-fcheck-prim-bounds -fno-ignore-asserts'
79+
run: cabal test --ghc-options='-fcheck-prim-bounds -fno-ignore-asserts'

0 commit comments

Comments
 (0)