Skip to content

Commit

Permalink
Merge pull request #313 from haskell-unordered-containers/ghc-9.12.1
Browse files Browse the repository at this point in the history
Allow GHC-9.12.1
  • Loading branch information
phadej authored Nov 9, 2024
2 parents 57e0d06 + 3484761 commit 4ec8c26
Show file tree
Hide file tree
Showing 3 changed files with 16 additions and 8 deletions.
17 changes: 12 additions & 5 deletions .github/workflows/haskell-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand All @@ -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
Expand All @@ -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 }}
Expand All @@ -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"
Expand Down Expand Up @@ -159,6 +165,7 @@ jobs:
echo "package hashable" >> cabal.project
echo " ghc-options: -Werror=missing-methods" >> cabal.project
cat >> cabal.project <<EOF
allow-newer: splitmix:base
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
Expand Down
1 change: 1 addition & 0 deletions cabal.project
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
packages: .
tests: True

allow-newer: splitmix:base
--
-- allow-newer: base
-- allow-newer: bytestring
Expand Down
6 changes: 3 additions & 3 deletions hashable.cabal
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down

0 comments on commit 4ec8c26

Please sign in to comment.