Skip to content

Commit 1e3c355

Browse files
authored
Merge pull request #11174 from haskell/ci-add-ghc-9.14-alpha1
CI: add ghc 9.14-alpha2
2 parents 493c2c5 + c780bea commit 1e3c355

File tree

9 files changed

+23
-11
lines changed

9 files changed

+23
-11
lines changed

.github/workflows/validate.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,7 @@ jobs:
6060
# IMPORTANT: If you remove a version from this list, then add it to the old-ghcs job below.
6161
# Also a removed GHC from here means that we are actually dropping
6262
# support, so the PR *must* have a changelog entry.
63+
"9.14.0.20250908",
6364
"9.12.2",
6465
"9.10.2",
6566
"9.8.4",
@@ -130,7 +131,7 @@ jobs:
130131
with:
131132
ghc-version: ${{ matrix.ghc }}
132133
cabal-version: 3.12.1.0 # see https://github.com/haskell/cabal/pull/10251
133-
ghcup-release-channel: https://raw.githubusercontent.com/haskell/ghcup-metadata/master/ghcup-prereleases-0.0.8.yaml
134+
ghcup-release-channel: https://raw.githubusercontent.com/haskell/ghcup-metadata/master/ghcup-prereleases-0.0.9.yaml
134135

135136
# See the following link for a breakdown of the following step
136137
# https://github.com/haskell/actions/issues/7#issuecomment-745697160

Cabal/Cabal.cabal

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -77,6 +77,9 @@ library
7777
if impl(ghc >= 8.0) && impl(ghc < 8.8)
7878
ghc-options: -Wnoncanonical-monadfail-instances
7979

80+
if impl(ghc >= 9.14)
81+
ghc-options: -Wno-pattern-namespace-specifier -Wno-incomplete-record-selectors
82+
8083
exposed-modules:
8184
Distribution.Backpack.Configure
8285
Distribution.Backpack.ComponentsGraph

cabal-install/cabal-install.cabal

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,9 @@ common warnings
6161
if impl(ghc < 8.8)
6262
ghc-options: -Wnoncanonical-monadfail-instances
6363

64+
if impl(ghc >= 9.14)
65+
ghc-options: -Wno-pattern-namespace-specifier -Wno-incomplete-record-selectors
66+
6467
common base-dep
6568
build-depends:
6669
, base >=4.13 && <4.22

cabal-install/tests/IntegrationTests2.hs

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2731,7 +2731,8 @@ testConfigOptionComments = do
27312731

27322732
testIgnoreProjectFlag :: Assertion
27332733
testIgnoreProjectFlag = do
2734-
-- Coverage flag should be false globally by default (~/.cabal folder)
2734+
-- Coverage flag should be false globally by default.
2735+
-- This should be covered by the vanilla config file created in `main`.
27352736
(_, _, prjConfigGlobal, _, _) <- configureProject testdir ignoreSetConfig
27362737
let globalCoverageFlag = packageConfigCoverage . projectConfigLocalPackages $ prjConfigGlobal
27372738
False @=? Flag.fromFlagOrDefault False globalCoverageFlag
@@ -2760,7 +2761,10 @@ testHaddockProjectDependencies config = do
27602761
(_, _, sharedConfig) <- planProject testdir config
27612762
-- `haddock-project` is only supported by `haddock-2.26.1` and above which is
27622763
-- shipped with `ghc-9.4`
2763-
when (compilerVersion (pkgConfigCompiler sharedConfig) > mkVersion [9, 4]) $ do
2764+
-- And doesn't work with older ghc on Windows for some reason (file in the
2765+
-- wrong place, perhaps?).
2766+
let safeMinor = if buildOS == Windows then 10 else 4
2767+
when (compilerVersion (pkgConfigCompiler sharedConfig) > mkVersion [9, safeMinor]) $ do
27642768
let dir = basedir </> testdir
27652769
cleanHaddockProject testdir
27662770
withCurrentDirectory dir $ do
@@ -2774,7 +2778,7 @@ testHaddockProjectDependencies config = do
27742778
["all"]
27752779
defaultGlobalFlags{globalStoreDir = Flag "store"}
27762780

2777-
let haddock = "haddocks" </> "async" </> "async.haddock"
2781+
let haddock = "haddocks" </> "time" </> "time.haddock"
27782782
hasHaddock <- doesFileExist haddock
27792783
unless hasHaddock $ assertFailure ("File `" ++ haddock ++ "` does not exist.")
27802784
cleanHaddockProject testdir

cabal-install/tests/IntegrationTests2/haddock-project/dependencies/a.cabal

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,6 @@ cabal-version: >= 1.10
55

66
library
77
exposed-modules: MyLib
8-
build-depends: base, async
8+
build-depends: base, time
99
hs-source-dirs: src
1010
default-language: Haskell2010

cabal-install/tests/IntegrationTests2/haddock-project/dependencies/cabal.project

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,5 +4,5 @@ jobs: 1
44

55
documentation: True
66

7-
package async
7+
package time
88
documentation: True
Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
module MyLib (someFunc) where
22

3-
import Control.Concurrent.Async
3+
import Data.Time.Clock
44

5-
someFunc :: IO (Async ())
6-
someFunc = async (return ())
5+
someFunc :: IO ()
6+
someFunc = print =<< getCurrentTime

project-cabal/ghc-latest.config

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,11 @@
88

99
-- NOTE: don't forget to update the compiler version in the conditional
1010
-- when upgrading to a newer GHC
11-
if impl(ghc >= 9.12.0)
11+
if impl(ghc >= 9.14.0)
1212
allow-newer:
1313
--windns:*, rere:*, tree-diff:*, uuid-types:*, these:*, assoc:*, semialign:*, indexed-traversable-instances:*, indexed-traversable:*, OneTuple:*, scientific:*, time-compat:*, text-short:*, integer-conversion:*, generically:*, data-fix:*, binary:*
1414
-- Artem, 2024-04-21: I started and then gave up...
15-
*:base, *:template-haskell, text-short, *:deepseq, *:bytestring, *:ghc-prim
15+
*:base, *:template-haskell, text-short, *:deepseq, *:bytestring, *:ghc-prim, *:ghc-bignum, *:containers
1616

1717
-- repository head.hackage.ghc.haskell.org
1818
-- url: https://ghc.gitlab.haskell.org/head.hackage/

project-cabal/ghc-options.config

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,3 +9,4 @@ if impl(ghc >= 9)
99
ghc-options: -Wunused-packages
1010
package cabal-testsuite
1111
ghc-options: -Wwarn=unused-packages
12+

0 commit comments

Comments
 (0)