Merge pull request #317 from haskell-unordered-containers/ghc-9.12

Support GHC-9.12.1
haskell-unordered-containers · Dec 19, 2024 · e29ed1a · e29ed1a
2 parents e3a7023 + a34da21
commit e29ed1a
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 28 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.19.20241202
+# version: 0.19.20241219
 #
-# REGENDATA ("0.19.20241202",["github","cabal.project"])
+# REGENDATA ("0.19.20241219",["github","cabal.project"])
 #
 name: Haskell-CI
 on:
@@ -32,10 +32,10 @@ jobs:
     strategy:
       matrix:
         include:
-          - compiler: ghc-9.12.0.20241128
+          - compiler: ghc-9.12.1
             compilerKind: ghc
-            compilerVersion: 9.12.0.20241128
-            setup-method: ghcup-prerelease
+            compilerVersion: 9.12.1
+            setup-method: ghcup
             allow-failure: false
           - compiler: ghc-9.10.1
             compilerKind: ghc
@@ -68,10 +68,11 @@ jobs:
           mkdir -p "$HOME/.ghcup/bin"
           curl -sL https://downloads.haskell.org/ghcup/0.1.30.0/x86_64-linux-ghcup-0.1.30.0 > "$HOME/.ghcup/bin/ghcup"
           chmod a+x "$HOME/.ghcup/bin/ghcup"
-      - name: Install cabal-install
+      - name: Install cabal-install (prerelease)
         run: |
-          "$HOME/.ghcup/bin/ghcup" install cabal 3.12.1.0 || (cat "$HOME"/.ghcup/logs/*.* && false)
-          echo "CABAL=$HOME/.ghcup/bin/cabal-3.12.1.0 -vnormal+nowrap" >> "$GITHUB_ENV"
+          "$HOME/.ghcup/bin/ghcup" config add-release-channel https://raw.githubusercontent.com/haskell/ghcup-metadata/master/ghcup-prereleases-0.0.8.yaml;
+          "$HOME/.ghcup/bin/ghcup" install cabal 3.15.0.0.2024.10.3 || (cat "$HOME"/.ghcup/logs/*.* && false)
+          echo "CABAL=$HOME/.ghcup/bin/cabal-3.15.0.0.2024.10.3 -vnormal+nowrap" >> "$GITHUB_ENV"
       - name: Install GHC (GHCup)
         if: matrix.setup-method == 'ghcup'
         run: |
@@ -100,21 +101,6 @@ jobs:
           HCKIND: ${{ matrix.compilerKind }}
           HCNAME: ${{ matrix.compiler }}
           HCVER: ${{ matrix.compilerVersion }}
-      - name: Install GHC (GHCup prerelease)
-        if: matrix.setup-method == 'ghcup-prerelease'
-        run: |
-          "$HOME/.ghcup/bin/ghcup" config add-release-channel https://raw.githubusercontent.com/haskell/ghcup-metadata/master/ghcup-prereleases-0.0.8.yaml;
-          "$HOME/.ghcup/bin/ghcup" install ghc "$HCVER" || (cat "$HOME"/.ghcup/logs/*.* && false)
-          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=$HCPKG" >> "$GITHUB_ENV"
-          echo "HADDOCK=$HADDOCK" >> "$GITHUB_ENV"
-        env:
-          HCKIND: ${{ matrix.compilerKind }}
-          HCNAME: ${{ matrix.compiler }}
-          HCVER: ${{ matrix.compilerVersion }}
       - name: Set PATH and environment variables
         run: |
           echo "$HOME/.cabal/bin" >> $GITHUB_PATH
@@ -204,7 +190,6 @@ jobs:
           echo "    ghc-options: -Werror=missing-methods" >> cabal.project
           cat >> cabal.project <<EOF
           allow-newer: splitmix-0.1.0.5:base
-          allow-newer: tagged-0.8.8:template-haskell
           EOF
           $HCPKG list --simple-output --names-only | perl -ne 'for (split /\s+/) { print "constraints: any.$_ installed\n" unless /^(hashable)$/; }' >> cabal.project.local
           cat cabal.project

diff --git a/cabal.project b/cabal.project
@@ -2,7 +2,6 @@ packages: .
 tests: True
 
 allow-newer: splitmix-0.1.0.5:base
-allow-newer: tagged-0.8.8:template-haskell
 
 --
 -- allow-newer: base

diff --git a/hashable.cabal b/hashable.cabal
@@ -1,6 +1,7 @@
 cabal-version:      2.2
 name:               hashable
 version:            1.5.0.0
+x-revision:         1
 synopsis:           A class for types that can be converted to a hash value
 description:
   This package defines a class, 'Hashable', for types that can be converted to a hash value.
@@ -31,7 +32,9 @@ bug-reports:
 stability:          Provisional
 category:           Data
 build-type:         Simple
-tested-with:        GHC ==9.6.5 || ==9.8.2 || ==9.8.3 || ==9.10.1 || ==9.12.1
+tested-with:
+  GHC ==9.6.5 || ==9.8.2 || ==9.8.3 || ==9.10.1 || ==9.12.1
+
 extra-source-files:
   CHANGES.md
   include/HsHashable.h
@@ -157,7 +160,7 @@ test-suite hashable-tests
     , random            >=1.0      && <1.3
     , tasty             ^>=1.5
     , tasty-hunit       ^>=0.10.1
-    , tasty-quickcheck  ^>=0.10.3
+    , tasty-quickcheck  ^>=0.10.3  || ^>=0.11
     , text              >=0.11.0.5
 
   if impl(ghc >=9.2)
@@ -187,7 +190,7 @@ test-suite xxhash-tests
     , primitive         ^>=0.9.0.0
     , tasty             ^>=1.5
     , tasty-hunit       ^>=0.10.1
-    , tasty-quickcheck  ^>=0.10.3
+    , tasty-quickcheck  ^>=0.10.3  || ^>=0.11
 
   include-dirs:     include xxHash-0.8.2
   includes: