Skip to content

Commit 4ec8c26

Browse files
authored
Merge pull request #313 from haskell-unordered-containers/ghc-9.12.1
Allow GHC-9.12.1
2 parents 57e0d06 + 3484761 commit 4ec8c26

File tree

3 files changed

+16
-8
lines changed

3 files changed

+16
-8
lines changed

.github/workflows/haskell-ci.yml

Lines changed: 12 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@
88
#
99
# For more information, see https://github.com/haskell-CI/haskell-ci
1010
#
11-
# version: 0.19.20240608
11+
# version: 0.19.20241109
1212
#
13-
# REGENDATA ("0.19.20240608",["github","cabal.project"])
13+
# REGENDATA ("0.19.20241109",["github","cabal.project"])
1414
#
1515
name: Haskell-CI
1616
on:
@@ -32,6 +32,11 @@ jobs:
3232
strategy:
3333
matrix:
3434
include:
35+
- compiler: ghc-9.12.0.20241031
36+
compilerKind: ghc
37+
compilerVersion: 9.12.0.20241031
38+
setup-method: ghcup
39+
allow-failure: false
3540
- compiler: ghc-9.10.1
3641
compilerKind: ghc
3742
compilerVersion: 9.10.1
@@ -54,10 +59,11 @@ jobs:
5459
apt-get update
5560
apt-get install -y --no-install-recommends gnupg ca-certificates dirmngr curl git software-properties-common libtinfo5
5661
mkdir -p "$HOME/.ghcup/bin"
57-
curl -sL https://downloads.haskell.org/ghcup/0.1.20.0/x86_64-linux-ghcup-0.1.20.0 > "$HOME/.ghcup/bin/ghcup"
62+
curl -sL https://downloads.haskell.org/ghcup/0.1.30.0/x86_64-linux-ghcup-0.1.30.0 > "$HOME/.ghcup/bin/ghcup"
5863
chmod a+x "$HOME/.ghcup/bin/ghcup"
64+
"$HOME/.ghcup/bin/ghcup" config add-release-channel https://raw.githubusercontent.com/haskell/ghcup-metadata/master/ghcup-prereleases-0.0.8.yaml;
5965
"$HOME/.ghcup/bin/ghcup" install ghc "$HCVER" || (cat "$HOME"/.ghcup/logs/*.* && false)
60-
"$HOME/.ghcup/bin/ghcup" install cabal 3.10.2.0 || (cat "$HOME"/.ghcup/logs/*.* && false)
66+
"$HOME/.ghcup/bin/ghcup" install cabal 3.12.1.0 || (cat "$HOME"/.ghcup/logs/*.* && false)
6167
env:
6268
HCKIND: ${{ matrix.compilerKind }}
6369
HCNAME: ${{ matrix.compiler }}
@@ -75,7 +81,7 @@ jobs:
7581
echo "HC=$HC" >> "$GITHUB_ENV"
7682
echo "HCPKG=$HCPKG" >> "$GITHUB_ENV"
7783
echo "HADDOCK=$HADDOCK" >> "$GITHUB_ENV"
78-
echo "CABAL=$HOME/.ghcup/bin/cabal-3.10.2.0 -vnormal+nowrap" >> "$GITHUB_ENV"
84+
echo "CABAL=$HOME/.ghcup/bin/cabal-3.12.1.0 -vnormal+nowrap" >> "$GITHUB_ENV"
7985
HCNUMVER=$(${HC} --numeric-version|perl -ne '/^(\d+)\.(\d+)\.(\d+)(\.(\d+))?$/; print(10000 * $1 + 100 * $2 + ($3 == 0 ? $5 != 1 : $3))')
8086
echo "HCNUMVER=$HCNUMVER" >> "$GITHUB_ENV"
8187
echo "ARG_TESTS=--enable-tests" >> "$GITHUB_ENV"
@@ -159,6 +165,7 @@ jobs:
159165
echo "package hashable" >> cabal.project
160166
echo " ghc-options: -Werror=missing-methods" >> cabal.project
161167
cat >> cabal.project <<EOF
168+
allow-newer: splitmix:base
162169
EOF
163170
$HCPKG list --simple-output --names-only | perl -ne 'for (split /\s+/) { print "constraints: any.$_ installed\n" unless /^(hashable)$/; }' >> cabal.project.local
164171
cat cabal.project

cabal.project

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
packages: .
22
tests: True
33

4+
allow-newer: splitmix:base
45
--
56
-- allow-newer: base
67
-- allow-newer: bytestring

hashable.cabal

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ bug-reports:
3131
stability: Provisional
3232
category: Data
3333
build-type: Simple
34-
tested-with: GHC ==9.6.5 || ==9.8.2 || ==9.10.1
34+
tested-with: GHC ==9.6.5 || ==9.8.2 || ==9.10.1 || ==9.12.1
3535
extra-source-files:
3636
CHANGES.md
3737
include/HsHashable.h
@@ -81,7 +81,7 @@ library
8181

8282
hs-source-dirs: src
8383
build-depends:
84-
, base >=4.18.0.0 && <4.21
84+
, base >=4.18.0.0 && <4.22
8585
, bytestring >=0.11.5.3 && <0.13
8686
, containers >=0.6.7 && <0.8
8787
, deepseq >=1.4.8.1 && <1.6
@@ -182,7 +182,7 @@ test-suite xxhash-tests
182182

183183
default-language: Haskell2010
184184
build-depends:
185-
, base
185+
, base <5
186186
, bytestring
187187
, primitive ^>=0.9.0.0
188188
, tasty ^>=1.5

0 commit comments

Comments
 (0)