Skip to content

Commit ef480de

Browse files
authored
Support for GHC 9.14 (#585)
* Support for GHC 9.14 * haskell-ci: Remove `installed` constraint on `time`
1 parent 8aa27ad commit ef480de

3 files changed

Lines changed: 15 additions & 8 deletions

File tree

.github/workflows/haskell-ci.yml

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@
88
#
99
# For more information, see https://github.com/haskell-CI/haskell-ci
1010
#
11-
# version: 0.19.20250917
11+
# version: 0.19.20260104
1212
#
13-
# REGENDATA ("0.19.20250917",["github","unordered-containers.cabal"])
13+
# REGENDATA ("0.19.20260104",["github","unordered-containers.cabal"])
1414
#
1515
name: Haskell-CI
1616
on:
@@ -35,14 +35,19 @@ jobs:
3535
strategy:
3636
matrix:
3737
include:
38+
- compiler: ghc-9.14.1
39+
compilerKind: ghc
40+
compilerVersion: 9.14.1
41+
setup-method: ghcup
42+
allow-failure: false
3843
- compiler: ghc-9.12.2
3944
compilerKind: ghc
4045
compilerVersion: 9.12.2
4146
setup-method: ghcup
4247
allow-failure: false
43-
- compiler: ghc-9.10.2
48+
- compiler: ghc-9.10.3
4449
compilerKind: ghc
45-
compilerVersion: 9.10.2
50+
compilerVersion: 9.10.3
4651
setup-method: ghcup
4752
allow-failure: false
4853
- compiler: ghc-9.8.4
@@ -197,7 +202,7 @@ jobs:
197202
if [ $((HCNUMVER >= 90000)) -ne 0 ] ; then echo " ghc-options: -Werror=incomplete-patterns -Werror=incomplete-uni-patterns" >> cabal.project ; fi
198203
cat >> cabal.project <<EOF
199204
EOF
200-
$HCPKG list --simple-output --names-only | perl -ne 'for (split /\s+/) { print "constraints: any.$_ installed\n" unless /^(binary|bytestring|containers|text|unordered-containers)$/; }' >> cabal.project.local
205+
$HCPKG list --simple-output --names-only | perl -ne 'for (split /\s+/) { print "constraints: any.$_ installed\n" unless /^(binary|bytestring|containers|text|time|unordered-containers)$/; }' >> cabal.project.local
201206
cat cabal.project
202207
cat cabal.project.local
203208
- name: dump install plan

cabal.haskell-ci

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ installed: -binary
1111
installed: -bytestring
1212
installed: -containers
1313
installed: -text
14+
installed: -time
1415

1516
-- With GHC < 9, haddock fails due to a parse error in the benchmarks.
1617
-- https://github.com/haskell-CI/haskell-ci/issues/605

unordered-containers.cabal

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,9 @@ cabal-version: >=1.10
2929
extra-source-files: CHANGES.md
3030

3131
tested-with:
32-
GHC ==9.12.2
33-
|| ==9.10.2
32+
GHC ==9.14.1
33+
|| ==9.12.2
34+
|| ==9.10.3
3435
|| ==9.8.4
3536
|| ==9.6.7
3637
|| ==9.4.8
@@ -60,7 +61,7 @@ library
6061
hashable >= 1.4 && < 1.6
6162
if impl(ghc)
6263
build-depends:
63-
template-haskell >= 2.16 && < 2.24
64+
template-haskell >= 2.16 && < 2.25
6465

6566
default-language: Haskell2010
6667

0 commit comments

Comments
 (0)