Merge pull request #612 from haskell-CI/ghc-9.4.1

Allow base-4.17

Author: phadej

.github/workflows/haskell-ci.yml

@@ -30,6 +30,11 @@ jobs:
     strategy:
       matrix:
         include:
+          - compiler: ghc-9.4.1
+            compilerKind: ghc
+            compilerVersion: 9.4.1
+            setup-method: ghcup
+            allow-failure: false
           - compiler: ghc-9.2.4
             compilerKind: ghc
             compilerVersion: 9.2.4
@@ -244,7 +249,7 @@ jobs:
         run: |
           perl -i -e 'while (<ARGV>) { print unless /package-id\s+(base-compat-batteries|bs-cmpt-bttrs)-\d+(\.\d+)*/; }' .ghc.environment.*
           if [ $((HCNUMVER < 90000)) -ne 0 ] ; then cd ${PKGDIR_haskell_ci} || false ; fi
-          if [ $((HCNUMVER < 90000)) -ne 0 ] ; then doctest --fast -XHaskell2010 -XNoImplicitPrelude -XBangPatterns -XDeriveAnyClass -XDeriveFoldable -XDeriveFunctor -XDeriveGeneric -XDeriveTraversable -XDerivingStrategies -XGeneralizedNewtypeDeriving -XScopedTypeVariables src ; fi
+          if [ $((HCNUMVER < 90000)) -ne 0 ] ; then doctest --fast -XHaskell2010 -XNoImplicitPrelude -XBangPatterns -XDeriveAnyClass -XDeriveFoldable -XDeriveFunctor -XDeriveGeneric -XDeriveTraversable -XDerivingStrategies -XGeneralizedNewtypeDeriving -XScopedTypeVariables -XTypeOperators src ; fi
           if [ $((HCNUMVER < 90000)) -ne 0 ] ; then cd ${PKGDIR_cabal_install_parsers} || false ; fi
           if [ $((HCNUMVER < 90000)) -ne 0 ] ; then doctest --fast -XHaskell2010 src ; fi
       - name: docspec

cabal-install-parsers/cabal-install-parsers.cabal

@@ -21,7 +21,7 @@ maintainer:         [email protected], [email protected]
 category:           Development
 build-type:         Simple
 tested-with:
-  GHC ==8.2.2 || ==8.4.4 || ==8.6.5 || ==8.8.4 || ==8.10.7 || ==9.0.2 || ==9.2.4
+  GHC ==8.2.2 || ==8.4.4 || ==8.6.5 || ==8.8.4 || ==8.10.7 || ==9.0.2 || ==9.2.4 || ==9.4.1
 
 extra-source-files:
   Changelog.md
@@ -54,7 +54,7 @@ library
 
   -- GHC-boot libraries
   build-depends:
-    , base          >=4.10     && <4.17
+    , base          >=4.10     && <4.18
     , binary        ^>=0.8.5
     , bytestring    ^>=0.10.8.1 || ^>=0.11.1.0
     , Cabal-syntax  ^>=3.8.1.0

haskell-ci.cabal

@@ -33,7 +33,14 @@ maintainer:         [email protected]
 category:           Development
 build-type:         Simple
 tested-with:
-  GHC ==8.2.2 || ==8.4.4 || ==8.6.5 || ==8.8.4 || ==8.10.7 || ==9.0.2 || ==9.2.4
+  GHC ==8.2.2
+   || ==8.4.4
+   || ==8.6.5
+   || ==8.8.4
+   || ==8.10.7
+   || ==9.0.2
+   || ==9.2.4
+   || ==9.4.1
 
 extra-source-files: CHANGELOG.md
 extra-source-files:
@@ -125,6 +132,7 @@ library haskell-ci-internal
     DerivingStrategies
     GeneralizedNewtypeDeriving
     ScopedTypeVariables
+    TypeOperators
 
   other-extensions:
     CPP
@@ -133,7 +141,7 @@ library haskell-ci-internal
     ViewPatterns
 
   build-depends:
-    , base          >=4.10     && <4.17
+    , base          >=4.10     && <4.18
     , binary        ^>=0.8.5.1
     , bytestring    ^>=0.10.8.1 || ^>=0.11.1.0
     , Cabal-syntax  ^>=3.8.1.0
@@ -155,7 +163,7 @@ library haskell-ci-internal
   build-depends:
     , aeson                          ^>=1.5.6.0 || ^>=2.0.0.0 || ^>=2.1.0.0
     , attoparsec                     ^>=0.14.1
-    , base-compat                    ^>=0.11 || ^>=0.12
+    , base-compat                    ^>=0.12
     , base16-bytestring              ^>=1.0.1.0
     , cabal-install-parsers          ^>=0.5
     , cryptohash-sha256              ^>=0.11.101.0

haskell-ci.sh

@@ -19,7 +19,7 @@ fi
 
 CFG_CABAL_STORE_CACHE=""
 CFG_CABAL_REPO_CACHE=""
-CFG_JOBS="9.2.4 9.0.2 8.10.7 8.8.4 8.6.5 8.4.4 8.2.2"
+CFG_JOBS="9.4.1 9.2.4 9.0.2 8.10.7 8.8.4 8.6.5 8.4.4 8.2.2"
 CFG_CABAL_UPDATE=false
 
 SCRIPT_NAME=$(basename "$0")
@@ -523,7 +523,7 @@ run_cmd $CABAL v2-test $ARG_COMPILER $ARG_TESTS $ARG_BENCH all --test-show-detai
 put_info "doctest"
 run_cmd perl -i -e 'while (<ARGV>) { print unless /package-id\s+(base-compat-batteries|bs-cmpt-bttrs)-\d+(\.\d+)*/; }' .ghc.environment.*
 change_dir_if $((HCNUMVER < 90000)) ${PKGDIR_haskell_ci}
-run_cmd_if $((HCNUMVER < 90000)) doctest --fast -XHaskell2010 -XNoImplicitPrelude -XBangPatterns -XDeriveAnyClass -XDeriveFoldable -XDeriveFunctor -XDeriveGeneric -XDeriveTraversable -XDerivingStrategies -XGeneralizedNewtypeDeriving -XScopedTypeVariables src
+run_cmd_if $((HCNUMVER < 90000)) doctest --fast -XHaskell2010 -XNoImplicitPrelude -XBangPatterns -XDeriveAnyClass -XDeriveFoldable -XDeriveFunctor -XDeriveGeneric -XDeriveTraversable -XDerivingStrategies -XGeneralizedNewtypeDeriving -XScopedTypeVariables -XTypeOperators src
 change_dir_if $((HCNUMVER < 90000)) ${PKGDIR_cabal_install_parsers}
 run_cmd_if $((HCNUMVER < 90000)) doctest --fast -XHaskell2010 src