Merge pull request #81 from haskellari/ghc-9.8

Support GHC-9.8, bunch of newer versions of packages
haskellari · Oct 17, 2023 · eb1f944 · eb1f944
2 parents cb39d65 + 76f1d61
commit eb1f944
Show file tree

Hide file tree

Showing 2 changed files with 36 additions and 26 deletions.
diff --git a/.github/workflows/haskell-ci.yml b/.github/workflows/haskell-ci.yml
@@ -8,9 +8,9 @@
 #
 # For more information, see https://github.com/haskell-CI/haskell-ci
 #
-# version: 0.16.5
+# version: 0.17.20231010
 #
-# REGENDATA ("0.16.5",["github","cabal.project"])
+# REGENDATA ("0.17.20231010",["github","cabal.project"])
 #
 name: Haskell-CI
 on:
@@ -37,14 +37,19 @@ jobs:
             compilerVersion: "8.4"
             setup-method: hvr-ppa
             allow-failure: false
-          - compiler: ghc-9.6.2
+          - compiler: ghc-9.8.1
             compilerKind: ghc
-            compilerVersion: 9.6.2
+            compilerVersion: 9.8.1
             setup-method: ghcup
             allow-failure: false
-          - compiler: ghc-9.4.5
+          - compiler: ghc-9.6.3
             compilerKind: ghc
-            compilerVersion: 9.4.5
+            compilerVersion: 9.6.3
+            setup-method: ghcup
+            allow-failure: false
+          - compiler: ghc-9.4.7
+            compilerKind: ghc
+            compilerVersion: 9.4.7
             setup-method: ghcup
             allow-failure: false
           - compiler: ghc-9.2.8
@@ -128,7 +133,7 @@ jobs:
           apt-get install -y --no-install-recommends gnupg ca-certificates dirmngr curl git software-properties-common libtinfo5
           if [ "${{ matrix.setup-method }}" = ghcup ]; then
             mkdir -p "$HOME/.ghcup/bin"
-            curl -sL https://downloads.haskell.org/ghcup/0.1.19.2/x86_64-linux-ghcup-0.1.19.2 > "$HOME/.ghcup/bin/ghcup"
+            curl -sL https://downloads.haskell.org/ghcup/0.1.19.5/x86_64-linux-ghcup-0.1.19.5 > "$HOME/.ghcup/bin/ghcup"
             chmod a+x "$HOME/.ghcup/bin/ghcup"
             "$HOME/.ghcup/bin/ghcup" install ghc "$HCVER" || (cat "$HOME"/.ghcup/logs/*.* && false)
             "$HOME/.ghcup/bin/ghcup" install cabal 3.10.1.0 || (cat "$HOME"/.ghcup/logs/*.* && false)
@@ -140,7 +145,7 @@ jobs:
             apt-get update
             if [ $((GHCJSARITH)) -ne 0 ] ; then apt-get install -y "$HCNAME" ghc-8.4.4 nodejs ; else apt-get install -y "$HCNAME" ; fi
             mkdir -p "$HOME/.ghcup/bin"
-            curl -sL https://downloads.haskell.org/ghcup/0.1.19.2/x86_64-linux-ghcup-0.1.19.2 > "$HOME/.ghcup/bin/ghcup"
+            curl -sL https://downloads.haskell.org/ghcup/0.1.19.5/x86_64-linux-ghcup-0.1.19.5 > "$HOME/.ghcup/bin/ghcup"
             chmod a+x "$HOME/.ghcup/bin/ghcup"
             "$HOME/.ghcup/bin/ghcup" install cabal 3.10.1.0 || (cat "$HOME"/.ghcup/logs/*.* && false)
           fi
@@ -157,10 +162,12 @@ jobs:
           echo "CABAL_CONFIG=$HOME/.cabal/config" >> "$GITHUB_ENV"
           HCDIR=/opt/$HCKIND/$HCVER
           if [ "${{ matrix.setup-method }}" = ghcup ]; then
-            HC=$HOME/.ghcup/bin/$HCKIND-$HCVER
+            HC=$("$HOME/.ghcup/bin/ghcup" whereis ghc "$HCVER")
+            HCPKG=$(echo "$HC" | sed 's#ghc$#ghc-pkg#')
+            HADDOCK=$(echo "$HC" | sed 's#ghc$#haddock#')
             echo "HC=$HC" >> "$GITHUB_ENV"
-            echo "HCPKG=$HOME/.ghcup/bin/$HCKIND-pkg-$HCVER" >> "$GITHUB_ENV"
-            echo "HADDOCK=$HOME/.ghcup/bin/haddock-$HCVER" >> "$GITHUB_ENV"
+            echo "HCPKG=$HCPKG" >> "$GITHUB_ENV"
+            echo "HADDOCK=$HADDOCK" >> "$GITHUB_ENV"
             echo "CABAL=$HOME/.ghcup/bin/cabal-3.10.1.0 -vnormal+nowrap" >> "$GITHUB_ENV"
           else
             HC=$HCDIR/bin/$HCKIND
@@ -310,6 +317,8 @@ jobs:
           rm -f cabal.project.local
       - name: constraint set random-hashable
         run: |
+          if [ $((! GHCJSARITH && HCNUMVER >= 90400 && HCNUMVER < 90600)) -ne 0 ] ; then $CABAL v2-build $ARG_COMPILER --enable-tests --disable-benchmarks --constraint='hashable >=1.3.2.0' --constraint='hashable +random-initial-seed' all --dry-run ; fi
+          if [ $((! GHCJSARITH && HCNUMVER >= 90400 && HCNUMVER < 90600)) -ne 0 ] ; then cabal-plan topo | sort ; fi
           if [ $((! GHCJSARITH && HCNUMVER >= 90400 && HCNUMVER < 90600)) -ne 0 ] ; then $CABAL v2-build $ARG_COMPILER --enable-tests --disable-benchmarks --constraint='hashable >=1.3.2.0' --constraint='hashable +random-initial-seed' --dependencies-only -j2 all ; fi
           if [ $((! GHCJSARITH && HCNUMVER >= 90400 && HCNUMVER < 90600)) -ne 0 ] ; then $CABAL v2-build $ARG_COMPILER --enable-tests --disable-benchmarks --constraint='hashable >=1.3.2.0' --constraint='hashable +random-initial-seed' all ; fi
           if [ $((! GHCJSARITH && HCNUMVER >= 90400 && HCNUMVER < 90600)) -ne 0 ] ; then $CABAL v2-test $ARG_COMPILER --enable-tests --disable-benchmarks --constraint='hashable >=1.3.2.0' --constraint='hashable +random-initial-seed' all ; fi

diff --git a/tree-diff.cabal b/tree-diff.cabal
@@ -1,7 +1,7 @@
 cabal-version:      2.2
 name:               tree-diff
 version:            0.3.0.1
-x-revision:         3
+x-revision:         4
 synopsis:           Diffing of (expression) trees.
 category:           Data, Testing
 description:
@@ -57,8 +57,9 @@ tested-with:
      || ==8.10.7
      || ==9.0.2
      || ==9.2.8
-     || ==9.4.5
-     || ==9.6.2
+     || ==9.4.7
+     || ==9.6.3
+     || ==9.8.1
   , GHCJS ==8.4
 
 extra-source-files:
@@ -87,30 +88,30 @@ library
 
   -- GHC boot libraries
   build-depends:
-    , base        >=4.5       && <4.19
-    , bytestring  ^>=0.9.2.1  || ^>=0.10.0.2 || ^>=0.11.0.0
+    , base        >=4.5       && <4.20
+    , bytestring  ^>=0.9.2.1  || ^>=0.10.0.2 || ^>=0.11.0.0 || ^>=0.12.0.2
     , containers  ^>=0.4.2.1  || ^>=0.5.0.0  || ^>=0.6.0.1
-    , deepseq     ^>=1.3.0.0  || ^>=1.4.0.0
+    , deepseq     ^>=1.3.0.0  || ^>=1.4.0.0  || ^>=1.5.0.0
     , parsec      ^>=3.1.13.0
     , pretty      ^>=1.1.1.0
-    , text        ^>=1.2.3.0  || ^>=2.0
-    , time        >=1.4       && <1.5        || >=1.5.0.1   && <1.6 || >=1.6.0.1 && <1.7 || >=1.8.0.2 && <1.9 || >=1.9.3 && <1.13
+    , text        ^>=1.2.3.0  || ^>=2.0      || ^>=2.1
+    , time        ^>=1.4      || ^>=1.5.0.1  || ^>=1.6.0.1  || ^>=1.8.0.2  || ^>=1.9.3 || ^>=1.10 || ^>=1.11 || ^>=1.12
 
   build-depends:
     , aeson                 ^>=1.4.6.0    || ^>=1.5.6.0  || ^>=2.0.0.0 || ^>=2.1.0.0 || ^>=2.2.0.0
     , ansi-terminal         >=0.10        && <0.12       || ^>=1.0
     , ansi-wl-pprint        ^>=0.6.8.2    || ^>=1.0.2
-    , base-compat           >=0           && <0.13       || ^>=0.13
+    , base-compat           ^>=0.10.5     || ^>=0.11     || ^>=0.12    || ^>=0.13
     , bytestring-builder    ^>=0.10.8.2.0
     , hashable              ^>=1.2.7.0    || ^>=1.3.0.0  || ^>=1.4.0.1
     , parsers               ^>=0.12.10
-    , primitive             >=0.7.1.0     && <0.8        || ^>=0.8
+    , primitive             ^>=0.7.1.0    || ^>=0.8.0.0  || ^>=0.9.0.0
     , QuickCheck            ^>=2.14.2
     , scientific            ^>=0.3.6.2
-    , semialign             >=1.2.0.1     && <1.3        || ^>=1.3
-    , strict                >=0.4.0.1     && <0.5        || ^>=0.5
+    , semialign             ^>=1.2.0.1    || ^>=1.3
+    , strict                ^>=0.4.0.1    || ^>=0.5
     , tagged                ^>=0.8.6
-    , these                 >=1.1.1.1     && <1.2        || ^>=1.2
+    , these                 ^>=1.1.1.1    || ^>=1.2
     , unordered-containers  ^>=0.2.8.0
     , uuid-types            ^>=1.0.3
     , vector                ^>=0.12.0.0   || ^>=0.13.0.0
@@ -127,7 +128,7 @@ library
   if !impl(ghc >=7.10)
     build-depends:
       , nats          ^>=1.1.2
-      , transformers  ^>=0.3.0.0 || ^>=0.4.2.0 || >=0.5.2.0 && <0.6 || ^>=0.6
+      , transformers  ^>=0.3.0.0 || ^>=0.4.2.0 || ^>=0.5.2.0 || ^>=0.6
       , void          ^>=0.7.3
 
   if (impl(ghc >=8) && !impl(ghc >=9.4))
@@ -175,7 +176,7 @@ test-suite tree-diff-test
 
   -- extra dependencies
   build-depends:
-    , tasty             ^>=1.2     || ^>=1.3.1 || ^>=1.4.2
+    , tasty             ^>=1.2     || ^>=1.3.1 || ^>=1.4.2 || ^>=1.5
     , tasty-golden      ^>=2.3.1.1
     , tasty-quickcheck  ^>=0.10.1
     , trifecta          >=2        && <2.2