Skip to content

Commit

Permalink
CI: GHC 9.8
Browse files Browse the repository at this point in the history
  • Loading branch information
ulysses4ever authored and erikd committed Apr 21, 2024
1 parent ddbface commit 3cca90f
Show file tree
Hide file tree
Showing 4 changed files with 18 additions and 7 deletions.
9 changes: 2 additions & 7 deletions .github/workflows/validate.yml
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ jobs:
strategy:
matrix:
os: ["ubuntu-latest", "macos-latest", "windows-latest"]
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"]
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"]
exclude:
# corrupts GHA cache or the fabric of reality itself, see https://github.com/haskell/cabal/issues/8356
- os: "windows-latest"
Expand Down Expand Up @@ -83,7 +83,7 @@ jobs:
id: setup-haskell
with:
ghc-version: ${{ matrix.ghc }}
cabal-version: '3.10.1.0'
cabal-version: latest # latest is mandatory for cabal-testsuite, see https://github.com/haskell/cabal/issues/8133

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

Expand Down
2 changes: 2 additions & 0 deletions cabal.project
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
import: cabal.project.latest-ghc

packages: Cabal/
packages: cabal-testsuite/
packages: Cabal-syntax/
Expand Down
12 changes: 12 additions & 0 deletions cabal.project.latest-ghc
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
-- Usually, the latest GHC requires a few allow-newer's
-- for some time after the release. This project file is meant to host these.
-- The file is supposed to be included in the main project files used for
-- Cabal development:
-- - cabal.project (day-to-day development),
-- - cabal.project.validate (Cabal CI),
-- Commented out below are the usual suspects. Feel free to add more.

-- NOTE: don't forget to update the compiler version in the conditional
-- when upgrading to a newer GHC
if impl(ghc >= 9.8.1)
-- allow-newer: windns:*
2 changes: 2 additions & 0 deletions cabal.project.validate
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
import: cabal.project.latest-ghc

packages: Cabal-syntax/
packages: Cabal/
packages: cabal-testsuite/
Expand Down

0 comments on commit 3cca90f

Please sign in to comment.