Skip to content

Commit 1ad7e5b

Browse files
committed
CI: add GHC 9.10
1 parent 596698f commit 1ad7e5b

File tree

5 files changed

+26
-5
lines changed

5 files changed

+26
-5
lines changed

.github/workflows/validate.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ jobs:
6868
matrix:
6969
os: [ubuntu-latest, macos-latest, windows-latest]
7070
# If you remove something from here.. then add it to the old-ghcs job.
71-
ghc: ['9.8.2', '9.6.4', '9.4.8', '9.2.8', '9.0.2', '8.10.7', '8.8.4', '8.6.5']
71+
ghc: ['9.10.0.20240413', '9.8.2', '9.6.4', '9.4.8', '9.2.8', '9.0.2', '8.10.7', '8.8.4', '8.6.5']
7272
exclude:
7373
# corrupts GHA cache or the fabric of reality itself, see https://github.com/haskell/cabal/issues/8356
7474
- os: windows-latest
@@ -102,6 +102,7 @@ jobs:
102102
with:
103103
ghc-version: ${{ matrix.ghc }}
104104
cabal-version: latest # latest is mandatory for cabal-testsuite, see https://github.com/haskell/cabal/issues/8133
105+
ghcup-release-channel: https://raw.githubusercontent.com/haskell/ghcup-metadata/master/ghcup-prereleases-0.0.8.yaml
105106

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

Cabal-hooks/Cabal-hooks.cabal

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ library
3131
Cabal >= 3.11 && < 3.13,
3232
base >= 4.9 && < 5,
3333
containers >= 0.5.0.0 && < 0.8,
34-
filepath >= 1.3.0.1 && < 1.5,
34+
filepath >= 1.3.0.1 && < 1.6,
3535
transformers >= 0.5.6.0 && < 0.7
3636

3737
ghc-options: -Wall -fno-ignore-asserts -fwarn-tabs -fwarn-incomplete-uni-patterns -fwarn-incomplete-record-updates

cabal-install/src/Distribution/Client/TargetSelector.hs

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -101,6 +101,11 @@ import Control.Arrow ((&&&))
101101
import Control.Monad hiding
102102
( mfilter
103103
)
104+
#if MIN_VERSION_base(4,20,0)
105+
import Data.Functor as UZ (unzip)
106+
#else
107+
import qualified Data.List.NonEmpty as UZ (unzip)
108+
#endif
104109
import Data.List
105110
( stripPrefix
106111
)
@@ -583,7 +588,7 @@ resolveTargetSelector knowntargets@KnownTargets{..} mfilter targetStrStatus =
583588

584589
classifyMatchErrors errs
585590
| Just expectedNE <- NE.nonEmpty expected =
586-
let (things, got :| _) = NE.unzip expectedNE
591+
let (things, got :| _) = UZ.unzip expectedNE
587592
in TargetSelectorExpected targetStr (NE.toList things) got
588593
| not (null nosuch) =
589594
TargetSelectorNoSuch targetStr nosuch

cabal-install/tests/UnitTests/Distribution/Client/Init/NonInteractive.hs

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
{-# LANGUAGE CPP #-}
12
{-# LANGUAGE LambdaCase #-}
23

34
module UnitTests.Distribution.Client.Init.NonInteractive
@@ -12,7 +13,9 @@ import UnitTests.Distribution.Client.Init.Utils
1213
import qualified Data.List.NonEmpty as NEL
1314
import qualified Distribution.SPDX as SPDX
1415

16+
#if !MIN_VERSION_base(4,20,0)
1517
import Data.List (foldl')
18+
#endif
1619
import qualified Data.Set as Set
1720
import Distribution.CabalSpecVersion
1821
import Distribution.Client.Init.Defaults

project-cabal/ghc-latest.config

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,5 +8,17 @@
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.8.1)
12-
-- allow-newer: windns:*
11+
if impl(ghc >= 9.10.0)
12+
allow-newer:
13+
--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:*
14+
-- Artem, 2024-04-21: I started and then gave up...
15+
*:base, *:template-haskell, text-short, *:deepseq, *:bytestring, *:ghc-prim
16+
17+
repository head.hackage.ghc.haskell.org
18+
url: https://ghc.gitlab.haskell.org/head.hackage/
19+
secure: True
20+
key-threshold: 3
21+
root-keys:
22+
26021a13b401500c8eb2761ca95c61f2d625bfef951b939a8124ed12ecf07329
23+
7541f32a4ccca4f97aea3b22f5e593ba2c0267546016b992dfadcd2fe944e55d
24+
f76d08be13e9a61a377a85e2fb63f4c5435d40f8feb3e12eb05905edb8cdea89

0 commit comments

Comments
 (0)