Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Sign up
Appearance settings

Commit a34da21

Browse files
committed
Support GHC-9.12.1
1 parent e3a7023 commit a34da21

File tree

3 files changed

+15
-28
lines changed

3 files changed

+15
-28
lines changed

‎.github/workflows/haskell-ci.yml‎

Lines changed: 9 additions & 24 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.20241202
11+
# version: 0.19.20241219
1212
#
13-
# REGENDATA ("0.19.20241202",["github","cabal.project"])
13+
# REGENDATA ("0.19.20241219",["github","cabal.project"])
1414
#
1515
name: Haskell-CI
1616
on:
@@ -32,10 +32,10 @@ jobs:
3232
strategy:
3333
matrix:
3434
include:
35-
- compiler: ghc-9.12.0.20241128
35+
- compiler: ghc-9.12.1
3636
compilerKind: ghc
37-
compilerVersion: 9.12.0.20241128
38-
setup-method: ghcup-prerelease
37+
compilerVersion: 9.12.1
38+
setup-method: ghcup
3939
allow-failure: false
4040
- compiler: ghc-9.10.1
4141
compilerKind: ghc
@@ -68,10 +68,11 @@ jobs:
6868
mkdir -p "$HOME/.ghcup/bin"
6969
curl -sL https://downloads.haskell.org/ghcup/0.1.30.0/x86_64-linux-ghcup-0.1.30.0 > "$HOME/.ghcup/bin/ghcup"
7070
chmod a+x "$HOME/.ghcup/bin/ghcup"
71-
- name: Install cabal-install
71+
- name: Install cabal-install (prerelease)
7272
run: |
73-
"$HOME/.ghcup/bin/ghcup" install cabal 3.12.1.0 || (cat "$HOME"/.ghcup/logs/*.* && false)
74-
echo "CABAL=$HOME/.ghcup/bin/cabal-3.12.1.0 -vnormal+nowrap" >> "$GITHUB_ENV"
73+
"$HOME/.ghcup/bin/ghcup" config add-release-channel https://raw.githubusercontent.com/haskell/ghcup-metadata/master/ghcup-prereleases-0.0.8.yaml;
74+
"$HOME/.ghcup/bin/ghcup" install cabal 3.15.0.0.2024年10月3日 || (cat "$HOME"/.ghcup/logs/*.* && false)
75+
echo "CABAL=$HOME/.ghcup/bin/cabal-3.15.0.0.2024年10月3日 -vnormal+nowrap" >> "$GITHUB_ENV"
7576
- name: Install GHC (GHCup)
7677
if: matrix.setup-method == 'ghcup'
7778
run: |
@@ -100,21 +101,6 @@ jobs:
100101
HCKIND: ${{ matrix.compilerKind }}
101102
HCNAME: ${{ matrix.compiler }}
102103
HCVER: ${{ matrix.compilerVersion }}
103-
- name: Install GHC (GHCup prerelease)
104-
if: matrix.setup-method == 'ghcup-prerelease'
105-
run: |
106-
"$HOME/.ghcup/bin/ghcup" config add-release-channel https://raw.githubusercontent.com/haskell/ghcup-metadata/master/ghcup-prereleases-0.0.8.yaml;
107-
"$HOME/.ghcup/bin/ghcup" install ghc "$HCVER" || (cat "$HOME"/.ghcup/logs/*.* && false)
108-
HC=$("$HOME/.ghcup/bin/ghcup" whereis ghc "$HCVER")
109-
HCPKG=$(echo "$HC" | sed 's#ghc$#ghc-pkg#')
110-
HADDOCK=$(echo "$HC" | sed 's#ghc$#haddock#')
111-
echo "HC=$HC" >> "$GITHUB_ENV"
112-
echo "HCPKG=$HCPKG" >> "$GITHUB_ENV"
113-
echo "HADDOCK=$HADDOCK" >> "$GITHUB_ENV"
114-
env:
115-
HCKIND: ${{ matrix.compilerKind }}
116-
HCNAME: ${{ matrix.compiler }}
117-
HCVER: ${{ matrix.compilerVersion }}
118104
- name: Set PATH and environment variables
119105
run: |
120106
echo "$HOME/.cabal/bin" >> $GITHUB_PATH
@@ -204,7 +190,6 @@ jobs:
204190
echo " ghc-options: -Werror=missing-methods" >> cabal.project
205191
cat >> cabal.project <<EOF
206192
allow-newer: splitmix-0.1.0.5:base
207-
allow-newer: tagged-0.8.8:template-haskell
208193
EOF
209194
$HCPKG list --simple-output --names-only | perl -ne 'for (split /\s+/) { print "constraints: any.$_ installed\n" unless /^(hashable)$/; }' >> cabal.project.local
210195
cat cabal.project

‎cabal.project‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@ packages: .
22
tests: True
33

44
allow-newer: splitmix-0.1.0.5:base
5-
allow-newer: tagged-0.8.8:template-haskell
65

76
--
87
-- allow-newer: base

‎hashable.cabal‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
cabal-version: 2.2
22
name: hashable
33
version: 1.5.0.0
4+
x-revision: 1
45
synopsis: A class for types that can be converted to a hash value
56
description:
67
This package defines a class, 'Hashable', for types that can be converted to a hash value.
@@ -31,7 +32,9 @@ bug-reports:
3132
stability: Provisional
3233
category: Data
3334
build-type: Simple
34-
tested-with: GHC ==9.6.5 || ==9.8.2 || ==9.8.3 || ==9.10.1 || ==9.12.1
35+
tested-with:
36+
GHC ==9.6.5 || ==9.8.2 || ==9.8.3 || ==9.10.1 || ==9.12.1
37+
3538
extra-source-files:
3639
CHANGES.md
3740
include/HsHashable.h
@@ -157,7 +160,7 @@ test-suite hashable-tests
157160
, random >=1.0 && <1.3
158161
, tasty ^>=1.5
159162
, tasty-hunit ^>=0.10.1
160-
, tasty-quickcheck ^>=0.10.3
163+
, tasty-quickcheck ^>=0.10.3 || ^>=0.11
161164
, text >=0.11.0.5
162165

163166
if impl(ghc >=9.2)
@@ -187,7 +190,7 @@ test-suite xxhash-tests
187190
, primitive ^>=0.9.0.0
188191
, tasty ^>=1.5
189192
, tasty-hunit ^>=0.10.1
190-
, tasty-quickcheck ^>=0.10.3
193+
, tasty-quickcheck ^>=0.10.3 || ^>=0.11
191194

192195
include-dirs: include xxHash-0.8.2
193196
includes:

0 commit comments

Comments
(0)

AltStyle によって変換されたページ (->オリジナル) /