Skip to content

Commit ece1234

Browse files
authored
Merge pull request #10199 from haskell/mergify/bp/3.12/pr-10194
CI: don't allow-newer for GHC 9.10 (backport #10194)
2 parents 85fcabe + e66ee8a commit ece1234

File tree

3 files changed

+5
-3
lines changed

3 files changed

+5
-3
lines changed

buildinfo-reference-generator/buildinfo-reference-generator.cabal

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ executable buildinfo-reference-generator
88
ghc-options: -Wall
99
main-is: Main.hs
1010
build-depends:
11-
, base >=4.11 && <4.20
11+
, base >=4.11 && <4.21
1212
, Cabal
1313
, Cabal-described
1414
, containers

cabal-testsuite/cabal-testsuite.cabal

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ common shared
2626
default-language: Haskell2010
2727

2828
build-depends:
29-
, base >= 4.11 && < 4.20
29+
, base >= 4.11 && < 4.21
3030
-- this needs to match the in-tree lib:Cabal version
3131
, Cabal ^>= 3.12.1.0
3232
, Cabal-syntax ^>= 3.12.1.0

project-cabal/ghc-latest.config

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,11 @@
66
-- - cabal.validate.project (Cabal CI),
77
-- Commented out below are the usual suspects. Feel free to add more.
88

9-
-- NOTE: don't forget to update the compiler version in the conditional
9+
-- NOTE: don't forget to update the compiler version in the conditionals
1010
-- when upgrading to a newer GHC
1111
if impl(ghc >= 9.10.0)
12+
allow-newer: rere:base
13+
if impl(ghc >= 9.12.0)
1214
allow-newer:
1315
--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:*
1416
-- Artem, 2024-04-21: I started and then gave up...

0 commit comments

Comments
 (0)