Skip to content

Commit 17645d9

Browse files
committed
Bump CI to GHC 9.8.2
1 parent 31427c2 commit 17645d9

File tree

10 files changed

+26
-19
lines changed

10 files changed

+26
-19
lines changed

.github/workflows/haskell-ci.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -32,9 +32,9 @@ jobs:
3232
strategy:
3333
matrix:
3434
include:
35-
- compiler: ghc-9.8.1
35+
- compiler: ghc-9.8.2
3636
compilerKind: ghc
37-
compilerVersion: 9.8.1
37+
compilerVersion: 9.8.2
3838
setup-method: ghcup
3939
allow-failure: false
4040
- compiler: ghc-9.6.4

.github/workflows/haskell.yml

+16-9
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ jobs:
1515
strategy:
1616
fail-fast: false
1717
matrix:
18-
ghc: ['9.8.1', '9.6.4', '9.4.8']
18+
ghc: ['9.8', '9.6', '9.4']
1919
os: [ubuntu-latest, macOS-latest, windows-latest]
2020
steps:
2121
- uses: actions/checkout@v4
@@ -24,24 +24,31 @@ jobs:
2424
id: setup
2525
with:
2626
ghc-version: ${{ matrix.ghc }}
27-
# cabal-version: '3.8.1.0'
27+
# cabal-version: latest
2828
cabal-update: true
2929

30-
- name: Cache
31-
uses: actions/cache@v4
30+
- name: Restore cache
31+
uses: actions/cache/restore@v4
32+
id: cache
3233
env:
33-
cache-name: haskell.yml
34+
key: ${{ runner.os }}-cabal-${{ steps.setup.outputs.cabal-version }}-ghc-${{ steps.setup.outputs.ghc-version }}
3435
with:
3536
path: ${{ steps.setup.outputs.cabal-store }}
36-
key: ${{ runner.os }}-${{ env.cache-name }}-ghc-${{ matrix.ghc }}-${{ hashFiles('**/*.cabal', '**/cabal.project') }}
37-
restore-keys: ${{ runner.os }}-${{ env.cache-name }}-ghc-${{ matrix.ghc }}-
37+
key: ${{ env.key }}-${{ github.sha }}
38+
restore-keys: ${{ env.key }}-
3839

3940
- name: Install dependencies
40-
run: |
41-
cabal build --only-dependencies --enable-tests --enable-benchmarks -vnormal+nowrap all
41+
run: cabal build --only-dependencies --enable-tests --enable-benchmarks -vnormal+nowrap all
4242

4343
- name: Build
4444
run: cabal build --enable-tests --enable-benchmarks -j1 -vnormal+nowrap all
4545

4646
- name: Run tests
4747
run: cabal test -j1 -vnormal+nowrap all
48+
49+
- name: Cache dependencies
50+
uses: actions/cache/save@v4
51+
if: always()
52+
with:
53+
path: ${{ steps.setup.outputs.cabal-store }}
54+
key: ${{ steps.cache.outputs.cache-primary-key }}

example-client/example-client.cabal

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ build-type: Simple
1212
cabal-version: >=1.10
1313

1414
tested-with:
15-
GHC == 9.8.1
15+
GHC == 9.8.2
1616
GHC == 9.6.4
1717
GHC == 9.4.8
1818
GHC == 9.2.8

hackage-repo-tool/hackage-repo-tool.cabal

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ homepage: https://github.com/haskell/hackage-security
2323
bug-reports: https://github.com/haskell/hackage-security/issues
2424

2525
tested-with:
26-
GHC == 9.8.1
26+
GHC == 9.8.2
2727
GHC == 9.6.4
2828
GHC == 9.4.8
2929
GHC == 9.2.8

hackage-root-tool/hackage-root-tool.cabal

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ build-type: Simple
1616
cabal-version: >=1.10
1717

1818
tested-with:
19-
GHC == 9.8.1
19+
GHC == 9.8.2
2020
GHC == 9.6.4
2121
GHC == 9.4.8
2222
GHC == 9.2.8

hackage-security-HTTP/hackage-security-HTTP.cabal

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ bug-reports: https://github.com/haskell/hackage-security/issues
1818
build-type: Simple
1919

2020
tested-with:
21-
GHC == 9.8.1
21+
GHC == 9.8.2
2222
GHC == 9.6.4
2323
GHC == 9.4.8
2424
GHC == 9.2.8

hackage-security-curl/hackage-security-curl.cabal

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ build-type: Simple
1616
cabal-version: >=1.10
1717

1818
tested-with:
19-
GHC == 9.8.1
19+
GHC == 9.8.2
2020
GHC == 9.6.4
2121
GHC == 9.4.8
2222
GHC == 9.2.8

hackage-security-http-client/hackage-security-http-client.cabal

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ cabal-version: >=1.10
1616
extra-source-files: ChangeLog.md
1717

1818
tested-with:
19-
GHC == 9.8.1
19+
GHC == 9.8.2
2020
GHC == 9.6.4
2121
GHC == 9.4.8
2222
GHC == 9.2.8

hackage-security/hackage-security.cabal

+1-1
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ bug-reports: https://github.com/haskell/hackage-security/issues
3131
build-type: Simple
3232

3333
tested-with:
34-
GHC == 9.8.1
34+
GHC == 9.8.2
3535
GHC == 9.6.4
3636
GHC == 9.4.8
3737
GHC == 9.2.8

precompute-fileinfo/precompute-fileinfo.cabal

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ build-type: Simple
1515
cabal-version: >=1.10
1616

1717
tested-with:
18-
GHC == 9.8.1
18+
GHC == 9.8.2
1919
GHC == 9.6.4
2020
GHC == 9.4.8
2121
GHC == 9.2.8

0 commit comments

Comments
 (0)