From 0d2870316dbe43517d503949c2bb60e075f55b4f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Laurent=20P=2E=20Ren=C3=A9=20de=20Cotret?= Date: Fri, 18 Sep 2026 14:46:01 -0400 Subject: [PATCH] Allow-newer clauses for GHC 9.14 --- .github/workflows/cabal.yml | 34 ++++++++++++---------------------- cabal.project | 11 +++++++++-- 2 files changed, 21 insertions(+), 24 deletions(-) diff --git a/.github/workflows/cabal.yml b/.github/workflows/cabal.yml index 20207e38..8a612684 100644 --- a/.github/workflows/cabal.yml +++ b/.github/workflows/cabal.yml @@ -20,26 +20,16 @@ jobs: strategy: fail-fast: false matrix: - include: - - ghc-version: "8.10.7" - cabal-flags: "" - - ghc-version: "9.0.2" - cabal-flags: "" - - ghc-version: "9.2.8" - cabal-flags: "" - - ghc-version: "9.4.8" - cabal-flags: "" - - ghc-version: "9.6.7" - cabal-flags: "" - - ghc-version: "9.8.4" - cabal-flags: "" - - ghc-version: "9.10.3" - cabal-flags: "" - - ghc-version: "9.12.2" - cabal-flags: "" - - ghc-version: "9.14.1" - # See issue 479 for when we can drop the following flags - cabal-flags: "--allow-newer=base --allow-newer=template-haskell" + ghc-version: + - "8.10" + - "9.0" + - "9.2" + - "9.4" + - "9.6" + - "9.8" + - "9.10" + - "9.12" + - "9.14" runs-on: "ubuntu-latest" @@ -57,7 +47,7 @@ jobs: run: | # Cloud Haskell tests using the QUIC backend are quite flaky, but in CI only. # Therefore, the 'quic' flag is normally enabled locally, but disabled in CI. - cabal configure --test-show-details=direct --flags "-quic" ${{matrix.cabal-flags}} + cabal configure --test-show-details=direct --flags "-quic" cabal freeze --minimize-conflict-set cat cabal.project.freeze @@ -124,4 +114,4 @@ jobs: # Run benchmarks with j1 so that we don't get interleaved output - name: Run benchmarks run: | - cabal bench all -j1 --project-file=cabal.optimized.project \ No newline at end of file + cabal bench all -j1 --project-file=cabal.optimized.project diff --git a/cabal.project b/cabal.project index d612efaf..8a019aad 100644 --- a/cabal.project +++ b/cabal.project @@ -1,6 +1,13 @@ packages: packages/*/**.cabal -tests: true -benchmarks: true +tests: True +benchmarks: True + +-- In order to support GHC 9.14, until new versions +-- of the following libraries, we must allow newer +-- versions of base +allow-newer: + cborg:base, + serialise:base package distributed-process-tests flags: +tcp