Skip to content

Commit 9bf8cc2

Browse files
authored
Merge pull request #100 from haskellari/QC-2.16
Allow QuickCheck-2.16
2 parents 83974f6 + ce148d6 commit 9bf8cc2

File tree

3 files changed

+13
-12
lines changed

3 files changed

+13
-12
lines changed

.github/workflows/haskell-ci.yml

Lines changed: 9 additions & 9 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.20250330
11+
# version: 0.19.20250708
1212
#
13-
# REGENDATA ("0.19.20250330",["github","cabal.project"])
13+
# REGENDATA ("0.19.20250708",["github","cabal.project"])
1414
#
1515
name: Haskell-CI
1616
on:
@@ -37,9 +37,9 @@ jobs:
3737
compilerVersion: 9.12.2
3838
setup-method: ghcup
3939
allow-failure: false
40-
- compiler: ghc-9.10.1
40+
- compiler: ghc-9.10.2
4141
compilerKind: ghc
42-
compilerVersion: 9.10.1
42+
compilerVersion: 9.10.2
4343
setup-method: ghcup
4444
allow-failure: false
4545
- compiler: ghc-9.8.4
@@ -95,8 +95,8 @@ jobs:
9595
chmod a+x "$HOME/.ghcup/bin/ghcup"
9696
- name: Install cabal-install
9797
run: |
98-
"$HOME/.ghcup/bin/ghcup" install cabal 3.14.1.1-p1 || (cat "$HOME"/.ghcup/logs/*.* && false)
99-
echo "CABAL=$HOME/.ghcup/bin/cabal-3.14.1.1-p1 -vnormal+nowrap" >> "$GITHUB_ENV"
98+
"$HOME/.ghcup/bin/ghcup" install cabal 3.14.2.0 || (cat "$HOME"/.ghcup/logs/*.* && false)
99+
echo "CABAL=$HOME/.ghcup/bin/cabal-3.14.2.0 -vnormal+nowrap" >> "$GITHUB_ENV"
100100
- name: Install GHC (GHCup)
101101
if: matrix.setup-method == 'ghcup'
102102
run: |
@@ -174,8 +174,8 @@ jobs:
174174
- name: install cabal-docspec
175175
run: |
176176
mkdir -p $HOME/.cabal/bin
177-
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
178-
echo '48bf3b7fd2f7f0caa6162afee57a755be8523e7f467b694900eb420f5f9a7b76 cabal-docspec.xz' | sha256sum -c -
177+
curl -sL https://github.com/phadej/cabal-extras/releases/download/cabal-docspec-0.0.0.20250606/cabal-docspec-0.0.0.20250606-x86_64-linux.xz > cabal-docspec.xz
178+
echo 'cc20bb5c19501b42bde77556bc419c7c0a5c8d1eb65663024d8a4e4c868bef25 cabal-docspec.xz' | sha256sum -c -
179179
xz -d < cabal-docspec.xz > $HOME/.cabal/bin/cabal-docspec
180180
rm -f cabal-docspec.xz
181181
chmod a+x $HOME/.cabal/bin/cabal-docspec
@@ -206,7 +206,7 @@ jobs:
206206
touch cabal.project.local
207207
echo "packages: ${PKGDIR_tree_diff}" >> cabal.project
208208
echo "package tree-diff" >> cabal.project
209-
echo " ghc-options: -Werror=missing-methods" >> cabal.project
209+
echo " ghc-options: -Werror=missing-methods -Werror=missing-fields" >> cabal.project
210210
cat >> cabal.project <<EOF
211211
EOF
212212
$HCPKG list --simple-output --names-only | perl -ne 'for (split /\s+/) { print "constraints: any.$_ installed\n" unless /^(tree-diff)$/; }' >> cabal.project.local

cabal.haskell-ci

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ branches: master
22
tests: >=7.6
33
haddock: >=7.8
44
docspec: >=8
5+
error-unused-packages: False
56

67
-- We would like to have this. But it just doesn't work with GHCJS
78
-- constraint-set bytestring-0.11

tree-diff.cabal

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
cabal-version: 2.2
22
name: tree-diff
33
version: 0.3.4
4-
x-revision: 1
4+
x-revision: 2
55
synopsis: Diffing of (expression) trees.
66
category: Data, Testing
77
description:
@@ -53,7 +53,7 @@ tested-with:
5353
|| ==9.4.8
5454
|| ==9.6.7
5555
|| ==9.8.4
56-
|| ==9.10.1
56+
|| ==9.10.2
5757
|| ==9.12.2
5858

5959
extra-source-files:
@@ -98,7 +98,7 @@ library
9898
, hashable ^>=1.4.4.0 || ^>=1.5.0.0
9999
, parsers ^>=0.12.11
100100
, primitive ^>=0.9.0.0
101-
, QuickCheck ^>=2.14.2 || ^>=2.15
101+
, QuickCheck ^>=2.14.2 || ^>=2.15 || ^>=2.16.0.0
102102
, scientific ^>=0.3.8.0
103103
, semialign ^>=1.3.1
104104
, strict ^>=0.5

0 commit comments

Comments
 (0)