Skip to content

Commit 47a036a

Browse files
committed
Bump to Cabal 3.14 and GHC 9.12
1 parent 33d9ea3 commit 47a036a

File tree

2 files changed

+28
-22
lines changed

2 files changed

+28
-22
lines changed

.github/workflows/haskell-ci.yml

Lines changed: 15 additions & 10 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.20250330
11+
# version: 0.19.20250506
1212
#
13-
# REGENDATA ("0.19.20250330",["github","hackage-server.cabal"])
13+
# REGENDATA ("0.19.20250506",["github","hackage-server.cabal"])
1414
#
1515
name: Haskell-CI
1616
on:
@@ -32,19 +32,24 @@ jobs:
3232
strategy:
3333
matrix:
3434
include:
35-
- compiler: ghc-9.10.1
35+
- compiler: ghc-9.12.2
3636
compilerKind: ghc
37-
compilerVersion: 9.10.1
37+
compilerVersion: 9.12.2
3838
setup-method: ghcup
3939
allow-failure: false
40-
- compiler: ghc-9.8.2
40+
- compiler: ghc-9.10.2
4141
compilerKind: ghc
42-
compilerVersion: 9.8.2
42+
compilerVersion: 9.10.2
4343
setup-method: ghcup
4444
allow-failure: false
45-
- compiler: ghc-9.6.5
45+
- compiler: ghc-9.8.4
4646
compilerKind: ghc
47-
compilerVersion: 9.6.5
47+
compilerVersion: 9.8.4
48+
setup-method: ghcup
49+
allow-failure: false
50+
- compiler: ghc-9.6.7
51+
compilerKind: ghc
52+
compilerVersion: 9.6.7
4853
setup-method: ghcup
4954
allow-failure: false
5055
- compiler: ghc-9.4.8
@@ -86,8 +91,8 @@ jobs:
8691
chmod a+x "$HOME/.ghcup/bin/ghcup"
8792
- name: Install cabal-install
8893
run: |
89-
"$HOME/.ghcup/bin/ghcup" install cabal 3.14.1.1-p1 || (cat "$HOME"/.ghcup/logs/*.* && false)
90-
echo "CABAL=$HOME/.ghcup/bin/cabal-3.14.1.1-p1 -vnormal+nowrap" >> "$GITHUB_ENV"
94+
"$HOME/.ghcup/bin/ghcup" install cabal 3.14.2.0 || (cat "$HOME"/.ghcup/logs/*.* && false)
95+
echo "CABAL=$HOME/.ghcup/bin/cabal-3.14.2.0 -vnormal+nowrap" >> "$GITHUB_ENV"
9196
- name: Install GHC (GHCup)
9297
if: matrix.setup-method == 'ghcup'
9398
run: |

hackage-server.cabal

Lines changed: 13 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -28,9 +28,10 @@ license: BSD-3-Clause
2828
license-file: LICENSE
2929

3030
tested-with:
31-
GHC == 9.10.1
32-
GHC == 9.8.2
33-
GHC == 9.6.5
31+
GHC == 9.12.2
32+
GHC == 9.10.2
33+
GHC == 9.8.4
34+
GHC == 9.6.7
3435
GHC == 9.4.8
3536
GHC == 9.2.8
3637
GHC == 9.0.2
@@ -130,10 +131,10 @@ common defaults
130131
-- see `cabal.project.local-ghc-${VERSION}` files
131132
build-depends:
132133
, array >= 0.5 && < 0.6
133-
, base >= 4.13 && < 4.21
134+
, base >= 4.13 && < 4.22
134135
, binary >= 0.8 && < 0.9
135136
, bytestring >= 0.10 && < 0.13
136-
, containers >= 0.6.0 && < 0.8
137+
, containers >= 0.6.0 && < 0.9
137138
, deepseq >= 1.4 && < 1.6
138139
, directory >= 1.3 && < 1.4
139140
, filepath >= 1.4 && < 1.6
@@ -142,15 +143,15 @@ common defaults
142143
, pretty >= 1.1 && < 1.2
143144
, process >= 1.6 && < 1.7
144145
, text ^>= 1.2.5.0 || >= 2.0 && < 2.2
145-
, time >= 1.9 && < 1.13
146+
, time >= 1.9 && < 1.15
146147
, transformers >= 0.5 && < 0.7
147148
, unix >= 2.7 && < 2.9
148149
, scientific
149150
-- other dependencies shared by most components
150151
build-depends:
151152
, aeson >= 2.1.0.0 && < 2.3
152-
, Cabal >= 3.12.1.0 && < 3.14
153-
, Cabal-syntax >= 3.12.1.0 && < 3.14
153+
, Cabal >= 3.14.2.0 && < 3.16
154+
, Cabal-syntax >= 3.14.2.0 && < 3.16
154155
-- Cabal-syntax needs to be bound to constrain hackage-security
155156
-- see https://github.com/haskell/hackage-server/issues/1130
156157
, fail ^>= 4.9.0
@@ -444,12 +445,12 @@ library
444445
-- haddock-library-1.11.0 changed type of markupOrderedList
445446
-- see https://github.com/haskell/hackage-server/issues/1128
446447
, happstack-server ^>= 7.7.1 || ^>= 7.8.0 || ^>= 7.9.0
447-
, hashable ^>= 1.3 || ^>= 1.4
448+
, hashable >= 1.3 && < 1.6
448449
, hs-captcha ^>= 1.0
449450
, hslogger ^>= 1.3.1
450451
, lifted-base ^>= 0.2.1
451452
, mime-mail ^>= 0.5
452-
, random ^>= 1.2
453+
, random >= 1.2 && < 1.4
453454
, rss ^>= 3000.2.0.7
454455
, safecopy ^>= 0.10
455456
, semigroups ^>= 0.20
@@ -458,7 +459,7 @@ library
458459
, stringsearch ^>= 0.3.6.6
459460
, tagged ^>= 0.8.5
460461
, transformers ^>= 0.6
461-
, xhtml >= 3000.2.0.0 && < 3000.4
462+
, xhtml >= 3000.2.0.0 && < 3000.5
462463
, xmlgen ^>= 0.6
463464
, xss-sanitize ^>= 0.3.6
464465

@@ -600,7 +601,7 @@ test-suite ReverseDependenciesTest
600601
, tasty-hedgehog ^>= 1.4
601602
, tasty-hunit ^>= 0.10
602603
, HUnit ^>= 1.6
603-
, hedgehog ^>= 1.4
604+
, hedgehog >= 1.4 && < 1.6
604605
, exceptions
605606
, bimap
606607
, mime-mail

0 commit comments

Comments
 (0)