diff --git a/.github/workflows/haskell-ci.yml b/.github/workflows/haskell-ci.yml index 02890fa3..d5daf154 100644 --- a/.github/workflows/haskell-ci.yml +++ b/.github/workflows/haskell-ci.yml @@ -70,11 +70,6 @@ jobs: compilerVersion: 8.8.4 setup-method: ghcup allow-failure: false - - compiler: ghc-8.6.5 - compilerKind: ghc - compilerVersion: 8.6.5 - setup-method: ghcup - allow-failure: false fail-fast: false steps: - name: apt-get install diff --git a/cabal-install-parsers/Changelog.md b/cabal-install-parsers/Changelog.md index 2e5c0d8d..93fca810 100644 --- a/cabal-install-parsers/Changelog.md +++ b/cabal-install-parsers/Changelog.md @@ -1,3 +1,8 @@ +## 0.6.3 + +- Drop support for GHC prior 8.8.4 +- Use `Cabal-syntax-3.14` + ## 0.6.2 - Drop support for GHC prior 8.6.5 diff --git a/cabal-install-parsers/cabal-install-parsers.cabal b/cabal-install-parsers/cabal-install-parsers.cabal index 17bc1674..66f0f576 100644 --- a/cabal-install-parsers/cabal-install-parsers.cabal +++ b/cabal-install-parsers/cabal-install-parsers.cabal @@ -1,6 +1,6 @@ cabal-version: 2.2 name: cabal-install-parsers -version: 0.6.2 +version: 0.6.3 synopsis: Utilities to work with cabal-install files description: @cabal-install-parsers@ provides parsers for @cabal-install@ files: @@ -25,8 +25,7 @@ maintainer: hvr@gnu.org, oleg.grenrus@iki.fi category: Development build-type: Simple tested-with: - GHC ==8.6.5 - || ==8.8.4 + GHC ==8.8.4 || ==8.10.7 || ==9.0.2 || ==9.2.8 @@ -66,19 +65,19 @@ library -- GHC-boot libraries build-depends: - , base >=4.12 && <4.21 - , binary ^>=0.8.6.0 - , bytestring ^>=0.10.8.2 || ^>=0.11.1.0 || ^>=0.12.0.2 - , Cabal-syntax ^>=3.12.0.0 - , containers ^>=0.6.0.1 || ^>=0.7 - , deepseq ^>=1.4.2.0 || ^>=1.5.0.0 - , directory ^>=1.3.0.0 - , filepath ^>=1.4.1.1 || ^>=1.5.2.0 - , parsec ^>=3.1.13.0 - , pretty ^>=1.1.3.3 - , text ^>=1.2.3.0 || ^>=2.0.1 || ^>=2.1 - , time ^>=1.8.0.2 || ^>=1.9.3 || ^>=1.11.1.1 || ^>=1.12.2 - , transformers ^>=0.5.2.0 || ^>=0.6.1.0 + , base >=4.13.0.0 && <4.21 + , binary ^>=0.8.7.0 + , bytestring ^>=0.10.10.1 || ^>=0.11.1.0 || ^>=0.12.0.2 + , Cabal-syntax ^>=3.14.2.0 + , containers ^>=0.6.2.1 || ^>=0.7 + , deepseq ^>=1.4.4.0 || ^>=1.5.0.0 + , directory ^>=1.3.6.0 + , filepath ^>=1.4.2.1 || ^>=1.5.2.0 + , parsec ^>=3.1.14.0 + , pretty ^>=1.1.3.6 + , text ^>=1.2.4.0 || ^>=2.0.1 || ^>=2.1 + , time ^>=1.9.3 || ^>=1.11.1.1 || ^>=1.12.2 + , transformers ^>=0.5.6.2 || ^>=0.6.1.0 -- extra dependencies build-depends: diff --git a/haskell-ci.cabal b/haskell-ci.cabal index d112b8c5..96941a54 100644 --- a/haskell-ci.cabal +++ b/haskell-ci.cabal @@ -26,8 +26,7 @@ maintainer: hvr@gnu.org category: Development build-type: Simple tested-with: - GHC ==8.6.5 - || ==8.8.4 + GHC ==8.8.4 || ==8.10.7 || ==9.0.2 || ==9.2.8 @@ -155,20 +154,20 @@ library haskell-ci-internal ViewPatterns build-depends: - , base >=4.12 && <4.21 - , binary ^>=0.8.5.1 - , bytestring ^>=0.10.8.1 || ^>=0.11.1.0 || ^>=0.12.0.2 - , Cabal-syntax ^>=3.12.0.0 - , containers ^>=0.6.0.1 || ^>=0.7 - , deepseq ^>=1.4.2.0 || ^>=1.5.0.0 - , directory ^>=1.3.0.0 - , filepath ^>=1.4.1.1 || ^>=1.5.2.0 + , base >=4.13 && <4.21 + , binary ^>=0.8.7.0 + , bytestring ^>=0.10.10.1 || ^>=0.11.1.0 || ^>=0.12.0.2 + , Cabal-syntax ^>=3.14.2.0 + , containers ^>=0.6.2.1 || ^>=0.7 + , deepseq ^>=1.4.4.0 || ^>=1.5.0.0 + , directory ^>=1.3.6.0 + , filepath ^>=1.4.2.1 || ^>=1.5.2.0 , mtl ^>=2.2.2 || ^>=2.3.1 - , parsec ^>=3.1.13.0 - , pretty ^>=1.1.3.3 - , process ^>=1.4.3.0 || ^>=1.6.1.0 - , text ^>=1.2.3.0 || ^>=2.0.1 || ^>=2.1 - , transformers ^>=0.5.2.0 || ^>=0.6.1.0 + , parsec ^>=3.1.14.0 + , pretty ^>=1.1.3.6 + , process ^>=1.6.9.0 + , text ^>=1.2.4.0 || ^>=2.0.1 || ^>=2.1 + , transformers ^>=0.5.6.2 || ^>=0.6.1.0 -- other dependencies build-depends: @@ -176,7 +175,7 @@ library haskell-ci-internal , attoparsec ^>=0.14.1 , base-compat ^>=0.14.0 , base16-bytestring ^>=1.0.1.0 - , cabal-install-parsers ^>=0.6.1.1 + , cabal-install-parsers ^>=0.6.3 , cryptohash-sha256 ^>=0.11.101.0 , exceptions ^>=0.10.0 , generic-lens-lite ^>=0.1 diff --git a/haskell-ci.sh b/haskell-ci.sh index 7d0a32b1..2226ab64 100755 --- a/haskell-ci.sh +++ b/haskell-ci.sh @@ -19,7 +19,7 @@ fi CFG_CABAL_STORE_CACHE="" CFG_CABAL_REPO_CACHE="" -CFG_JOBS="9.10.2 9.8.4 9.6.7 9.4.8 9.2.8 9.0.2 8.10.7 8.8.4 8.6.5" +CFG_JOBS="9.10.2 9.8.4 9.6.7 9.4.8 9.2.8 9.0.2 8.10.7 8.8.4" CFG_CABAL_UPDATE=false SCRIPT_NAME=$(basename "$0")