CI: don't allow-newer for GHC 9.10 (#10194)

* CI: don't allow-newer for GHC 9.10 * allow-newer base for rere * buildinfo-reference-generator: bump base bound * cabal-testsuite: bump base bound (cherry picked from commit cb34d2a)
haskell · Jul 14, 2024 · e66ee8a · e66ee8a
1 parent 85fcabe
commit e66ee8a
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 3 deletions.
diff --git a/buildinfo-reference-generator/buildinfo-reference-generator.cabal b/buildinfo-reference-generator/buildinfo-reference-generator.cabal
@@ -8,7 +8,7 @@ executable buildinfo-reference-generator
   ghc-options:      -Wall
   main-is:          Main.hs
   build-depends:
-    , base             >=4.11 && <4.20
+    , base             >=4.11 && <4.21
     , Cabal
     , Cabal-described
     , containers

diff --git a/cabal-testsuite/cabal-testsuite.cabal b/cabal-testsuite/cabal-testsuite.cabal
@@ -26,7 +26,7 @@ common shared
   default-language: Haskell2010
 
   build-depends:
-    , base >= 4.11 && < 4.20
+    , base >= 4.11 && < 4.21
     -- this needs to match the in-tree lib:Cabal version
     , Cabal ^>= 3.12.1.0
     , Cabal-syntax ^>= 3.12.1.0

diff --git a/project-cabal/ghc-latest.config b/project-cabal/ghc-latest.config
@@ -6,9 +6,11 @@
 --   - cabal.validate.project (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
+-- NOTE: don't forget to update the compiler version in the conditionals
 -- when upgrading to a newer GHC
 if impl(ghc >= 9.10.0)
+    allow-newer: rere:base
+if impl(ghc >= 9.12.0)
     allow-newer:
     --windns:*, rere:*, tree-diff:*, uuid-types:*, these:*, hashable:*, assoc:*, semialign:*, indexed-traversable-instances:*, indexed-traversable:*, OneTuple:*, scientific:*, time-compat:*, text-short:*, integer-conversion:*, generically:*, data-fix:*, binary:*
     -- Artem, 2024-04-21: I started and then gave up...