Skip to content

Commit c155656

Browse files
committed
CI: GHC 9.8
1 parent 6fca93b commit c155656

File tree

4 files changed

+18
-7
lines changed

4 files changed

+18
-7
lines changed

.github/workflows/validate.yml

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ jobs:
4949
strategy:
5050
matrix:
5151
os: ["ubuntu-latest", "macos-latest", "windows-latest"]
52-
ghc: ["9.6.3", "9.4.7", "9.2.8", "9.0.2", "8.10.7", "8.8.4", "8.6.5", "8.4.4"]
52+
ghc: ["9.8.1", "9.6.3", "9.4.8", "9.2.8", "9.0.2", "8.10.7", "8.8.4", "8.6.5", "8.4.4"]
5353
exclude:
5454
# corrupts GHA cache or the fabric of reality itself, see https://github.com/haskell/cabal/issues/8356
5555
- os: "windows-latest"
@@ -83,7 +83,7 @@ jobs:
8383
id: setup-haskell
8484
with:
8585
ghc-version: ${{ matrix.ghc }}
86-
cabal-version: '3.10.1.0'
86+
cabal-version: latest # latest is mandatory for cabal-testsuite, see https://github.com/haskell/cabal/issues/8133
8787

8888
- name: Work around git problem https://bugs.launchpad.net/ubuntu/+source/git/+bug/1993586 (cabal PR #8546)
8989
run: |
@@ -117,11 +117,6 @@ jobs:
117117
fi
118118
echo "FLAGS=$FLAGS" >> $GITHUB_ENV
119119
120-
- name: Allow newer dependencies when built with latest GHC
121-
if: ${{ matrix.ghc }} == '9.6.3'
122-
run: |
123-
echo "allow-newer: rere:base, rere:transformers" >> cabal.project.validate
124-
125120
- name: Validate print-config
126121
run: sh validate.sh $FLAGS -s print-config
127122

cabal.project

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
import: cabal.project.latest-ghc
2+
13
packages: Cabal/
24
packages: cabal-testsuite/
35
packages: Cabal-syntax/

cabal.project.latest-ghc

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
-- Usually, the latest GHC requires a few allow-newer's
2+
-- for some time after the release. This project file is meant to host these.
3+
-- The file is supposed to be included in the main project files used for
4+
-- Cabal development:
5+
-- - cabal.project (day-to-day development),
6+
-- - cabal.project.validate (Cabal CI),
7+
-- Commented out below are the usual suspects. Feel free to add more.
8+
9+
-- NOTE: don't forget to update the compiler version in the conditional
10+
-- when upgrading to a newer GHC
11+
if impl(ghc >= 9.8.1)
12+
-- allow-newer: windns:*

cabal.project.validate

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
import: cabal.project.latest-ghc
2+
13
packages: Cabal-syntax/
24
packages: Cabal/
35
packages: cabal-testsuite/

0 commit comments

Comments
 (0)