Skip to content

Commit 567023a

Browse files
committed
Fixup build with GHC 9.14
1 parent 73ba4fd commit 567023a

1 file changed

Lines changed: 12 additions & 3 deletions

File tree

.github/workflows/cabal.yml

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,14 +22,24 @@ jobs:
2222
matrix:
2323
include:
2424
- ghc-version: "8.10.7"
25+
cabal-flags: ""
2526
- ghc-version: "9.0.2"
27+
cabal-flags: ""
2628
- ghc-version: "9.2.8"
29+
cabal-flags: ""
2730
- ghc-version: "9.4.8"
31+
cabal-flags: ""
2832
- ghc-version: "9.6.7"
33+
cabal-flags: ""
2934
- ghc-version: "9.8.4"
35+
cabal-flags: ""
3036
- ghc-version: "9.10.3"
37+
cabal-flags: ""
3138
- ghc-version: "9.12.2"
39+
cabal-flags: ""
3240
- ghc-version: "9.14.1"
41+
# See issue 479 for when we can drop the following flags
42+
cabal-flags: "--allow-newer=base --allow-newer=template-haskell"
3343

3444
runs-on: "ubuntu-latest"
3545

@@ -47,7 +57,7 @@ jobs:
4757
run: |
4858
# Cloud Haskell tests using the QUIC backend are quite flaky, but in CI only.
4959
# Therefore, the 'quic' flag is normally enabled locally, but disabled in CI.
50-
cabal configure --test-show-details=direct --flags "-quic"
60+
cabal configure --test-show-details=direct --flags "-quic" ${{matrix.cabal-flags}}
5161
cabal freeze --minimize-conflict-set
5262
cat cabal.project.freeze
5363
@@ -57,7 +67,7 @@ jobs:
5767
path: |
5868
dist-newstyle
5969
${{ steps.setup-haskell.outputs.cabal-store }}
60-
key: ${{ runner.os }}-ghc-${{ matrix.ghc-version }}-${{ hashFiles('cabal.project', 'cabal.project.freeze') }}
70+
key: ${{ runner.os }}-ghc-${{ matrix.ghc-version }}-${{ hashFiles('cabal.project', 'cabal.project.local', 'cabal.project.freeze') }}
6171
restore-keys: |
6272
${{ runner.os }}-ghc-${{ matrix.ghc-version }}-
6373
@@ -73,4 +83,3 @@ jobs:
7383
timeout-minutes: 10
7484
# We run each test suite one-by-one to better observe problems.
7585
run: cabal test all -j1
76-

0 commit comments

Comments
 (0)