Skip to content

Commit 9dc5cab

Browse files
andreasabelulysses4ever
authored andcommitted
enable GHC 9.4, add it to CI
Also allow latest aeson, network-wait, optparse-applicative in cabal-testsuite.
1 parent 3abed74 commit 9dc5cab

File tree

4 files changed

+10
-13
lines changed

4 files changed

+10
-13
lines changed

.github/workflows/validate.yml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ jobs:
3838
strategy:
3939
matrix:
4040
os: ["ubuntu-latest", "macos-latest", "windows-latest"]
41-
ghc: ["9.2.3", "9.0.2", "8.10.7", "8.8.4", "8.6.5", "8.4.4"]
41+
ghc: ["9.4.2", "9.2.3", "9.0.2", "8.10.7", "8.8.4", "8.6.5", "8.4.4"]
4242
exclude:
4343
# corrupts GHA cache or the fabric of reality itself, see https://github.com/haskell/cabal/issues/8356
4444
- os: "windows-latest"
@@ -61,7 +61,7 @@ jobs:
6161
id: setup-haskell
6262
with:
6363
ghc-version: ${{ matrix.ghc }}
64-
cabal-version: latest # default, keeping for visibility
64+
cabal-version: '3.8.1.0'
6565

6666
# See the following link for a breakdown of the following step
6767
# https://github.com/haskell/actions/issues/7#issuecomment-745697160
@@ -212,6 +212,7 @@ jobs:
212212
id: setup-haskell
213213
with:
214214
ghc-version: ${{ matrix.ghc }}
215+
cabal-version: '3.8.1.0'
215216

216217
# As we are reusing the cached build dir from the previous step
217218
# the generated artifacts are available here,

cabal-install-solver/cabal-install-solver.cabal

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@ library
105105

106106
build-depends:
107107
, array >=0.4 && <0.6
108-
, base >=4.10 && <4.17
108+
, base >=4.10 && <4.18
109109
, bytestring >=0.10.6.0 && <0.12
110110
, Cabal ^>=3.9
111111
, Cabal-syntax ^>=3.9
@@ -138,7 +138,7 @@ Test-Suite unit-tests
138138
UnitTests.Distribution.Solver.Modular.MessageUtils
139139

140140
build-depends:
141-
, base >= 4.10 && <4.17
141+
, base >= 4.10 && <4.18
142142
, Cabal
143143
, Cabal-syntax
144144
, cabal-install-solver

cabal-install/cabal-install.cabal

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ common warnings
4646
ghc-options: -Wunused-packages
4747

4848
common base-dep
49-
build-depends: base >=4.10 && <4.17
49+
build-depends: base >=4.10 && <4.18
5050

5151
common cabal-dep
5252
build-depends: Cabal ^>=3.9

cabal-testsuite/cabal-testsuite.cabal

Lines changed: 4 additions & 8 deletions
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.6 && <4.17
29+
, base >= 4.6 && <4.18
3030
-- this needs to match the in-tree lib:Cabal version
3131
, Cabal ^>= 3.9.0.0
3232
, Cabal-syntax ^>= 3.9.0.0
@@ -114,10 +114,6 @@ custom-setup
114114
-- we only depend on even stable releases of lib:Cabal
115115
-- and due to Custom complexity and ConstraintSetupCabalMaxVersion
116116
-- it can't be the current version
117-
if impl(ghc < 8)
118-
setup-depends: Cabal == 3.6.*,
119-
Cabal-syntax == 3.6.*,
120-
else
121-
setup-depends: Cabal == 3.8.*,
122-
Cabal-syntax == 3.8.*,
123-
setup-depends: base, filepath, directory
117+
setup-depends: Cabal == 3.8.*,
118+
Cabal-syntax == 3.8.*,
119+
base, filepath, directory

0 commit comments

Comments
 (0)