Merge pull request #40 from haskellari/ghc-9.6

Add GHC-9.6 job
haskellari · Mar 15, 2023 · 40a8b5f · 40a8b5f
2 parents 07bfeb3 + c0f1b08
commit 40a8b5f
Show file tree

Hide file tree

Showing 6 changed files with 36 additions and 40 deletions.
diff --git a/.github/workflows/haskell-ci.yml b/.github/workflows/haskell-ci.yml
@@ -32,14 +32,19 @@ jobs:
     strategy:
       matrix:
         include:
-          - compiler: ghc-9.4.2
+          - compiler: ghc-9.6.1
             compilerKind: ghc
-            compilerVersion: 9.4.2
+            compilerVersion: 9.6.1
             setup-method: ghcup
             allow-failure: false
-          - compiler: ghc-9.2.4
+          - compiler: ghc-9.4.4
             compilerKind: ghc
-            compilerVersion: 9.2.4
+            compilerVersion: 9.4.4
+            setup-method: ghcup
+            allow-failure: false
+          - compiler: ghc-9.2.7
+            compilerKind: ghc
+            compilerVersion: 9.2.7
             setup-method: ghcup
             allow-failure: false
           - compiler: ghc-9.0.2
@@ -206,8 +211,8 @@ jobs:
         run: |
           touch cabal.project
           echo "packages: $GITHUB_WORKSPACE/source/strict" >> cabal.project
-          if [ $((HCNUMVER >= 70800)) -ne 0 ] ; then echo "packages: $GITHUB_WORKSPACE/source/strict-lens" >> cabal.project ; fi
-          if [ $((HCNUMVER >= 70800)) -ne 0 ] ; then echo "packages: $GITHUB_WORKSPACE/source/strict-base-types" >> cabal.project ; fi
+          if [ $((HCNUMVER >= 80000)) -ne 0 ] ; then echo "packages: $GITHUB_WORKSPACE/source/strict-lens" >> cabal.project ; fi
+          if [ $((HCNUMVER >= 80000)) -ne 0 ] ; then echo "packages: $GITHUB_WORKSPACE/source/strict-base-types" >> cabal.project ; fi
           if [ $((HCNUMVER >= 80000)) -ne 0 ] ; then echo "packages: $GITHUB_WORKSPACE/source/strict-optics" >> cabal.project ; fi
           cat cabal.project
       - name: sdist
@@ -232,8 +237,8 @@ jobs:
           touch cabal.project
           touch cabal.project.local
           echo "packages: ${PKGDIR_strict}" >> cabal.project
-          if [ $((HCNUMVER >= 70800)) -ne 0 ] ; then echo "packages: ${PKGDIR_strict_lens}" >> cabal.project ; fi
-          if [ $((HCNUMVER >= 70800)) -ne 0 ] ; then echo "packages: ${PKGDIR_strict_base_types}" >> cabal.project ; fi
+          if [ $((HCNUMVER >= 80000)) -ne 0 ] ; then echo "packages: ${PKGDIR_strict_lens}" >> cabal.project ; fi
+          if [ $((HCNUMVER >= 80000)) -ne 0 ] ; then echo "packages: ${PKGDIR_strict_base_types}" >> cabal.project ; fi
           if [ $((HCNUMVER >= 80000)) -ne 0 ] ; then echo "packages: ${PKGDIR_strict_optics}" >> cabal.project ; fi
           if [ $((HCNUMVER >= 80200)) -ne 0 ] ; then echo "package strict" >> cabal.project ; fi
           if [ $((HCNUMVER >= 80200)) -ne 0 ] ; then echo "    ghc-options: -Werror=missing-methods" >> cabal.project ; fi
@@ -244,10 +249,6 @@ jobs:
           if [ $((HCNUMVER >= 80200)) -ne 0 ] ; then echo "package strict-optics" >> cabal.project ; fi
           if [ $((HCNUMVER >= 80200)) -ne 0 ] ; then echo "    ghc-options: -Werror=missing-methods" >> cabal.project ; fi
           cat >> cabal.project <<EOF
-          allow-newer: *:strict
-          allow-newer: *:these
-          allow-newer: *:assoc
-          allow-newer: *:semialign
           EOF
           $HCPKG list --simple-output --names-only | perl -ne 'for (split /\s+/) { print "constraints: $_ installed\n" unless /^(strict|strict-base-types|strict-lens|strict-optics)$/; }' >> cabal.project.local
           cat cabal.project
@@ -272,10 +273,10 @@ jobs:
         run: |
           cd ${PKGDIR_strict} || false
           ${CABAL} -vnormal check
-          if [ $((HCNUMVER >= 70800)) -ne 0 ] ; then cd ${PKGDIR_strict_lens} || false ; fi
-          if [ $((HCNUMVER >= 70800)) -ne 0 ] ; then ${CABAL} -vnormal check ; fi
-          if [ $((HCNUMVER >= 70800)) -ne 0 ] ; then cd ${PKGDIR_strict_base_types} || false ; fi
-          if [ $((HCNUMVER >= 70800)) -ne 0 ] ; then ${CABAL} -vnormal check ; fi
+          if [ $((HCNUMVER >= 80000)) -ne 0 ] ; then cd ${PKGDIR_strict_lens} || false ; fi
+          if [ $((HCNUMVER >= 80000)) -ne 0 ] ; then ${CABAL} -vnormal check ; fi
+          if [ $((HCNUMVER >= 80000)) -ne 0 ] ; then cd ${PKGDIR_strict_base_types} || false ; fi
+          if [ $((HCNUMVER >= 80000)) -ne 0 ] ; then ${CABAL} -vnormal check ; fi
           if [ $((HCNUMVER >= 80000)) -ne 0 ] ; then cd ${PKGDIR_strict_optics} || false ; fi
           if [ $((HCNUMVER >= 80000)) -ne 0 ] ; then ${CABAL} -vnormal check ; fi
       - name: haddock

diff --git a/cabal.project b/cabal.project
@@ -2,8 +2,3 @@ packages: strict/
 packages: strict-lens/
 packages: strict-base-types/
 packages: strict-optics/
-
-allow-newer: *:strict
-allow-newer: *:these
-allow-newer: *:assoc
-allow-newer: *:semialign
diff --git a/strict-base-types/strict-base-types.cabal b/strict-base-types/strict-base-types.cabal
@@ -24,17 +24,16 @@ homepage:           https://github.com/haskell-strict/strict
 cabal-version:      >=1.10
 build-type:         Simple
 tested-with:
-  GHC ==7.8.4
-   || ==7.10.3
-   || ==8.0.2
+  GHC ==8.0.2
    || ==8.2.2
    || ==8.4.4
    || ==8.6.5
    || ==8.8.4
    || ==8.10.7
    || ==9.0.2
-   || ==9.2.4
-   || ==9.4.2
+   || ==9.2.7
+   || ==9.4.4
+   || ==9.6.1
 
 extra-source-files: CHANGES
 
@@ -47,8 +46,8 @@ library
   default-language: Haskell2010
   ghc-options:      -Wall
   build-depends:
-      aeson                 >=1.5.3.0 && <1.6 || >=2.0 && <2.2
-    , base                  >=4.7     && <5
+      aeson                 >=2.1.2.1 && <2.2
+    , base                  >=4.9     && <5
     , quickcheck-instances  >=0.3.24  && <0.4
     , strict                >=0.5     && <0.5.1
     , strict-lens           >=0.4     && <0.5

diff --git a/strict-lens/strict-lens.cabal b/strict-lens/strict-lens.cabal
@@ -18,17 +18,16 @@ homepage:           https://github.com/haskell-strict/strict
 cabal-version:      >=1.10
 build-type:         Simple
 tested-with:
-  GHC ==7.8.4
-   || ==7.10.3
-   || ==8.0.2
+  GHC ==8.0.2
    || ==8.2.2
    || ==8.4.4
    || ==8.6.5
    || ==8.8.4
    || ==8.10.7
    || ==9.0.2
-   || ==9.2.4
-   || ==9.4.2
+   || ==9.2.7
+   || ==9.4.4
+   || ==9.6.1
 
 extra-source-files: CHANGES.md
 
@@ -47,9 +46,9 @@ library
       -Wnoncanonical-monadfail-instances
 
   build-depends:
-      base    >=4.7 && <5
-    , lens    >=5   && <5.3
-    , strict  >=0.5 && <0.6
+      base    >=4.9   && <5
+    , lens    >=5.2.1 && <5.3
+    , strict  >=0.5   && <0.6
 
   hs-source-dirs:   src
   exposed-modules:  Data.Strict.Lens
diff --git a/strict-optics/strict-optics.cabal b/strict-optics/strict-optics.cabal
@@ -27,8 +27,9 @@ tested-with:
    || ==8.8.4
    || ==8.10.7
    || ==9.0.2
-   || ==9.2.4
-   || ==9.4.2
+   || ==9.2.7
+   || ==9.4.4
+   || ==9.6.1
 
 extra-source-files: CHANGES.md
 

diff --git a/strict/strict.cabal b/strict/strict.cabal
@@ -66,8 +66,9 @@ tested-with:
    || ==8.8.4
    || ==8.10.7
    || ==9.0.2
-   || ==9.2.4
-   || ==9.4.2
+   || ==9.2.7
+   || ==9.4.4
+   || ==9.6.1
 
 library
   default-language: Haskell2010