diff --git a/.github/workflows/haskell-ci.yml b/.github/workflows/haskell-ci.yml index e8270da..fdd4efb 100644 --- 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.20240608 +# version: 0.19.20241109 # -# REGENDATA ("0.19.20240608",["github","cabal.project"]) +# REGENDATA ("0.19.20241109",["github","cabal.project"]) # name: Haskell-CI on: @@ -32,6 +32,11 @@ jobs: strategy: matrix: include: + - compiler: ghc-9.12.0.20241031 + compilerKind: ghc + compilerVersion: 9.12.0.20241031 + setup-method: ghcup + allow-failure: false - compiler: ghc-9.10.1 compilerKind: ghc compilerVersion: 9.10.1 @@ -54,10 +59,11 @@ jobs: apt-get update apt-get install -y --no-install-recommends gnupg ca-certificates dirmngr curl git software-properties-common libtinfo5 mkdir -p "$HOME/.ghcup/bin" - curl -sL https://downloads.haskell.org/ghcup/0.1.20.0/x86_64-linux-ghcup-0.1.20.0 > "$HOME/.ghcup/bin/ghcup" + 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" + "$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) - "$HOME/.ghcup/bin/ghcup" install cabal 3.10.2.0 || (cat "$HOME"/.ghcup/logs/*.* && false) + "$HOME/.ghcup/bin/ghcup" install cabal 3.12.1.0 || (cat "$HOME"/.ghcup/logs/*.* && false) env: HCKIND: ${{ matrix.compilerKind }} HCNAME: ${{ matrix.compiler }} @@ -75,7 +81,7 @@ jobs: echo "HC=$HC" >> "$GITHUB_ENV" echo "HCPKG=$HCPKG" >> "$GITHUB_ENV" echo "HADDOCK=$HADDOCK" >> "$GITHUB_ENV" - echo "CABAL=$HOME/.ghcup/bin/cabal-3.10.2.0 -vnormal+nowrap" >> "$GITHUB_ENV" + echo "CABAL=$HOME/.ghcup/bin/cabal-3.12.1.0 -vnormal+nowrap" >> "$GITHUB_ENV" HCNUMVER=$(${HC} --numeric-version|perl -ne '/^(\d+)\.(\d+)\.(\d+)(\.(\d+))?$/; print(10000 * $1 + 100 * $2 + ($3 == 0 ? $5 != 1 : $3))') echo "HCNUMVER=$HCNUMVER" >> "$GITHUB_ENV" echo "ARG_TESTS=--enable-tests" >> "$GITHUB_ENV" @@ -159,6 +165,7 @@ jobs: echo "package hashable" >> cabal.project echo " ghc-options: -Werror=missing-methods" >> cabal.project cat >> cabal.project <> cabal.project.local cat cabal.project diff --git a/cabal.project b/cabal.project index 7cbdb4e..5b5d749 100644 --- a/cabal.project +++ b/cabal.project @@ -1,6 +1,7 @@ packages: . tests: True +allow-newer: splitmix:base -- -- allow-newer: base -- allow-newer: bytestring diff --git a/hashable.cabal b/hashable.cabal index 79901f9..d95f3d2 100644 --- a/hashable.cabal +++ b/hashable.cabal @@ -31,7 +31,7 @@ bug-reports: stability: Provisional category: Data build-type: Simple -tested-with: GHC ==9.6.5 || ==9.8.2 || ==9.10.1 +tested-with: GHC ==9.6.5 || ==9.8.2 || ==9.10.1 || ==9.12.1 extra-source-files: CHANGES.md include/HsHashable.h @@ -81,7 +81,7 @@ library hs-source-dirs: src build-depends: - , base >=4.18.0.0 && <4.21 + , base >=4.18.0.0 && <4.22 , bytestring >=0.11.5.3 && <0.13 , containers >=0.6.7 && <0.8 , deepseq >=1.4.8.1 && <1.6 @@ -182,7 +182,7 @@ test-suite xxhash-tests default-language: Haskell2010 build-depends: - , base + , base <5 , bytestring , primitive ^>=0.9.0.0 , tasty ^>=1.5