Skip to content

Commit 1a97751

Browse files
authoredAug 2, 2024··
Merge pull request #128 from haskellari/hashable-1.5
Allow hashable-1.5
2 parents 84a845b + 55b7666 commit 1a97751

File tree

2 files changed

+24
-17
lines changed

2 files changed

+24
-17
lines changed
 

‎.github/workflows/haskell-ci.yml

+18-13
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.20240514
11+
# version: 0.19.20240708
1212
#
13-
# REGENDATA ("0.19.20240514",["github","--config=cabal.haskell-ci","lattices.cabal"])
13+
# REGENDATA ("0.19.20240708",["github","--config=cabal.haskell-ci","lattices.cabal"])
1414
#
1515
name: Haskell-CI
1616
on:
@@ -32,19 +32,24 @@ jobs:
3232
strategy:
3333
matrix:
3434
include:
35-
- compiler: ghc-9.8.1
35+
- compiler: ghc-9.10.1
3636
compilerKind: ghc
37-
compilerVersion: 9.8.1
37+
compilerVersion: 9.10.1
3838
setup-method: ghcup
3939
allow-failure: false
40-
- compiler: ghc-9.6.3
40+
- compiler: ghc-9.8.2
4141
compilerKind: ghc
42-
compilerVersion: 9.6.3
42+
compilerVersion: 9.8.2
4343
setup-method: ghcup
4444
allow-failure: false
45-
- compiler: ghc-9.4.7
45+
- compiler: ghc-9.6.5
4646
compilerKind: ghc
47-
compilerVersion: 9.4.7
47+
compilerVersion: 9.6.5
48+
setup-method: ghcup
49+
allow-failure: false
50+
- compiler: ghc-9.4.8
51+
compilerKind: ghc
52+
compilerVersion: 9.4.8
4853
setup-method: ghcup
4954
allow-failure: false
5055
- compiler: ghc-9.2.8
@@ -79,10 +84,10 @@ jobs:
7984
apt-get update
8085
apt-get install -y --no-install-recommends gnupg ca-certificates dirmngr curl git software-properties-common libtinfo5
8186
mkdir -p "$HOME/.ghcup/bin"
82-
curl -sL https://downloads.haskell.org/ghcup/0.1.20.0/x86_64-linux-ghcup-0.1.20.0 > "$HOME/.ghcup/bin/ghcup"
87+
curl -sL https://downloads.haskell.org/ghcup/0.1.30.0/x86_64-linux-ghcup-0.1.30.0 > "$HOME/.ghcup/bin/ghcup"
8388
chmod a+x "$HOME/.ghcup/bin/ghcup"
8489
"$HOME/.ghcup/bin/ghcup" install ghc "$HCVER" || (cat "$HOME"/.ghcup/logs/*.* && false)
85-
"$HOME/.ghcup/bin/ghcup" install cabal 3.10.2.0 || (cat "$HOME"/.ghcup/logs/*.* && false)
90+
"$HOME/.ghcup/bin/ghcup" install cabal 3.12.1.0 || (cat "$HOME"/.ghcup/logs/*.* && false)
8691
env:
8792
HCKIND: ${{ matrix.compilerKind }}
8893
HCNAME: ${{ matrix.compiler }}
@@ -100,7 +105,7 @@ jobs:
100105
echo "HC=$HC" >> "$GITHUB_ENV"
101106
echo "HCPKG=$HCPKG" >> "$GITHUB_ENV"
102107
echo "HADDOCK=$HADDOCK" >> "$GITHUB_ENV"
103-
echo "CABAL=$HOME/.ghcup/bin/cabal-3.10.2.0 -vnormal+nowrap" >> "$GITHUB_ENV"
108+
echo "CABAL=$HOME/.ghcup/bin/cabal-3.12.1.0 -vnormal+nowrap" >> "$GITHUB_ENV"
104109
HCNUMVER=$(${HC} --numeric-version|perl -ne '/^(\d+)\.(\d+)\.(\d+)(\.(\d+))?$/; print(10000 * $1 + 100 * $2 + ($3 == 0 ? $5 != 1 : $3))')
105110
echo "HCNUMVER=$HCNUMVER" >> "$GITHUB_ENV"
106111
echo "ARG_TESTS=--enable-tests" >> "$GITHUB_ENV"
@@ -164,8 +169,8 @@ jobs:
164169
- name: install cabal-docspec
165170
run: |
166171
mkdir -p $HOME/.cabal/bin
167-
curl -sL https://github.com/phadej/cabal-extras/releases/download/cabal-docspec-0.0.0.20240414/cabal-docspec-0.0.0.20240414-x86_64-linux.xz > cabal-docspec.xz
168-
echo '2d18a3f79619e8ec5f11870f926f6dc2616e02a6c889315b7f82044b95a1adb9 cabal-docspec.xz' | sha256sum -c -
172+
curl -sL https://github.com/phadej/cabal-extras/releases/download/cabal-docspec-0.0.0.20240703/cabal-docspec-0.0.0.20240703-x86_64-linux.xz > cabal-docspec.xz
173+
echo '48bf3b7fd2f7f0caa6162afee57a755be8523e7f467b694900eb420f5f9a7b76 cabal-docspec.xz' | sha256sum -c -
169174
xz -d < cabal-docspec.xz > $HOME/.cabal/bin/cabal-docspec
170175
rm -f cabal-docspec.xz
171176
chmod a+x $HOME/.cabal/bin/cabal-docspec

‎lattices.cabal

+6-4
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
cabal-version: 1.18
22
name: lattices
33
version: 2.2.1
4+
x-revision: 1
45
category: Math
56
license: BSD3
67
license-file: LICENSE
@@ -27,9 +28,10 @@ tested-with:
2728
|| ==8.10.4
2829
|| ==9.0.2
2930
|| ==9.2.8
30-
|| ==9.4.7
31-
|| ==9.6.3
32-
|| ==9.8.1
31+
|| ==9.4.8
32+
|| ==9.6.5
33+
|| ==9.8.2
34+
|| ==9.10.1
3335

3436
synopsis:
3537
Fine-grained library for constructing and manipulating lattices
@@ -81,7 +83,7 @@ library
8183
base >=4.12 && <4.21
8284
, containers >=0.5.0.0 && <0.8
8385
, deepseq >=1.3.0.0 && <1.6
84-
, hashable >=1.2.7.0 && <1.5
86+
, hashable >=1.2.7.0 && <1.6
8587
, integer-logarithms >=1.0.3 && <1.1
8688
, QuickCheck >=2.12.6.1 && <2.16
8789
, tagged >=0.8.6 && <0.9

0 commit comments

Comments
 (0)
Please sign in to comment.