Skip to content

Commit

Permalink
support GHC 9.4, CI: bump minor for 9.2
Browse files Browse the repository at this point in the history
Also allow latest aeson, network-wait, optparse-applicative in cabal-testsuite.
  • Loading branch information
andreasabel authored and ulysses4ever committed Aug 23, 2022
1 parent db36806 commit 0bee7c6
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 8 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/validate.yml
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ jobs:
strategy:
matrix:
os: ["ubuntu-latest", "macos-latest", "windows-latest"]
ghc: ["9.2.3", "9.0.2", "8.10.7", "8.8.4", "8.6.5", "8.4.4"]
ghc: ["9.4.1", "9.2.4", "9.0.2", "8.10.7", "8.8.4", "8.6.5", "8.4.4"]
exclude:
# corrupts GHA cache or the fabric of reality itself, see https://github.com/haskell/cabal/issues/8356
- os: "windows-latest"
Expand All @@ -61,7 +61,7 @@ jobs:
id: setup-haskell
with:
ghc-version: ${{ matrix.ghc }}
cabal-version: latest # default, keeping for visibility
cabal-version: '3.8.1.0'

# See the following link for a breakdown of the following step
# https://github.com/haskell/actions/issues/7#issuecomment-745697160
Expand Down
4 changes: 2 additions & 2 deletions cabal-install-solver/cabal-install-solver.cabal
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@ library

build-depends:
, array >=0.4 && <0.6
, base >=4.10 && <4.17
, base >=4.10 && <4.18
, bytestring >=0.10.6.0 && <0.12
, Cabal ^>=3.9
, Cabal-syntax ^>=3.9
Expand Down Expand Up @@ -138,7 +138,7 @@ Test-Suite unit-tests
UnitTests.Distribution.Solver.Modular.MessageUtils

build-depends:
, base >= 4.10 && <4.17
, base >= 4.10 && <4.18
, Cabal
, Cabal-syntax
, cabal-install-solver
Expand Down
2 changes: 1 addition & 1 deletion cabal-install/cabal-install.cabal
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ common warnings
ghc-options: -Wunused-packages

common base-dep
build-depends: base >=4.10 && <4.17
build-depends: base >=4.10 && <4.18

common cabal-dep
build-depends: Cabal ^>=3.9
Expand Down
6 changes: 3 additions & 3 deletions cabal-testsuite/cabal-testsuite.cabal
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ common shared
default-language: Haskell2010

build-depends:
, base >= 4.6 && <4.17
, base >= 4.6 && <4.18
-- this needs to match the in-tree lib:Cabal version
, Cabal ^>= 3.9.0.0
, Cabal-syntax ^>= 3.9.0.0
Expand Down Expand Up @@ -113,6 +113,6 @@ custom-setup
-- we only depend on even stable releases of lib:Cabal
-- and due to Custom complexity and ConstraintSetupCabalMaxVersion
-- it can't be the current version
setup-depends: Cabal == 3.6.*,
Cabal-syntax == 3.6.*,
setup-depends: Cabal == 3.8.*,
Cabal-syntax == 3.8.*,
base, filepath, directory

0 comments on commit 0bee7c6

Please sign in to comment.