Skip to content

Commit 0d2f854

Browse files
committed
Support GHC-9.14
1 parent 906be60 commit 0d2f854

File tree

3 files changed

+37
-22
lines changed

3 files changed

+37
-22
lines changed

.github/workflows/haskell-ci.yml

Lines changed: 25 additions & 14 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.20241220
11+
# version: 0.19.20260104
1212
#
13-
# REGENDATA ("0.19.20241220",["github","integer-logarithms.cabal"])
13+
# REGENDATA ("0.19.20260104",["github","integer-logarithms.cabal"])
1414
#
1515
name: Haskell-CI
1616
on:
@@ -20,10 +20,13 @@ on:
2020
pull_request:
2121
branches:
2222
- master
23+
merge_group:
24+
branches:
25+
- master
2326
jobs:
2427
linux:
2528
name: Haskell-CI - Linux - ${{ matrix.compiler }}
26-
runs-on: ubuntu-20.04
29+
runs-on: ubuntu-24.04
2730
timeout-minutes:
2831
60
2932
container:
@@ -32,14 +35,19 @@ jobs:
3235
strategy:
3336
matrix:
3437
include:
35-
- compiler: ghc-9.12.1
38+
- compiler: ghc-9.14.1
39+
compilerKind: ghc
40+
compilerVersion: 9.14.1
41+
setup-method: ghcup
42+
allow-failure: false
43+
- compiler: ghc-9.12.2
3644
compilerKind: ghc
37-
compilerVersion: 9.12.1
45+
compilerVersion: 9.12.2
3846
setup-method: ghcup
3947
allow-failure: false
40-
- compiler: ghc-9.10.1
48+
- compiler: ghc-9.10.2
4149
compilerKind: ghc
42-
compilerVersion: 9.10.1
50+
compilerVersion: 9.10.2
4351
setup-method: ghcup
4452
allow-failure: false
4553
- compiler: ghc-9.8.4
@@ -91,13 +99,12 @@ jobs:
9199
- name: Install GHCup
92100
run: |
93101
mkdir -p "$HOME/.ghcup/bin"
94-
curl -sL https://downloads.haskell.org/ghcup/0.1.30.0/x86_64-linux-ghcup-0.1.30.0 > "$HOME/.ghcup/bin/ghcup"
102+
curl -sL https://downloads.haskell.org/ghcup/0.1.50.1/x86_64-linux-ghcup-0.1.50.1 > "$HOME/.ghcup/bin/ghcup"
95103
chmod a+x "$HOME/.ghcup/bin/ghcup"
96-
- name: Install cabal-install (prerelease)
104+
- name: Install cabal-install
97105
run: |
98-
"$HOME/.ghcup/bin/ghcup" config add-release-channel https://raw.githubusercontent.com/haskell/ghcup-metadata/master/ghcup-prereleases-0.0.8.yaml;
99-
"$HOME/.ghcup/bin/ghcup" install cabal 3.15.0.0.2024.10.3 || (cat "$HOME"/.ghcup/logs/*.* && false)
100-
echo "CABAL=$HOME/.ghcup/bin/cabal-3.15.0.0.2024.10.3 -vnormal+nowrap" >> "$GITHUB_ENV"
106+
"$HOME/.ghcup/bin/ghcup" install cabal 3.16.0.0 || (cat "$HOME"/.ghcup/logs/*.* && false)
107+
echo "CABAL=$HOME/.ghcup/bin/cabal-3.16.0.0 -vnormal+nowrap" >> "$GITHUB_ENV"
101108
- name: Install GHC (GHCup)
102109
if: matrix.setup-method == 'ghcup'
103110
run: |
@@ -173,7 +180,7 @@ jobs:
173180
chmod a+x $HOME/.cabal/bin/cabal-plan
174181
cabal-plan --version
175182
- name: checkout
176-
uses: actions/checkout@v4
183+
uses: actions/checkout@v5
177184
with:
178185
path: source
179186
- name: initial cabal.project for sdist
@@ -198,7 +205,11 @@ jobs:
198205
touch cabal.project.local
199206
echo "packages: ${PKGDIR_integer_logarithms}" >> cabal.project
200207
echo "package integer-logarithms" >> cabal.project
201-
echo " ghc-options: -Werror=missing-methods" >> cabal.project
208+
echo " ghc-options: -Werror=missing-methods -Werror=missing-fields" >> cabal.project
209+
if [ $((HCNUMVER >= 90400)) -ne 0 ] ; then echo "package integer-logarithms" >> cabal.project ; fi
210+
if [ $((HCNUMVER >= 90400)) -ne 0 ] ; then echo " ghc-options: -Werror=unused-packages" >> cabal.project ; fi
211+
if [ $((HCNUMVER >= 90000)) -ne 0 ] ; then echo "package integer-logarithms" >> cabal.project ; fi
212+
if [ $((HCNUMVER >= 90000)) -ne 0 ] ; then echo " ghc-options: -Werror=incomplete-patterns -Werror=incomplete-uni-patterns" >> cabal.project ; fi
202213
cat >> cabal.project <<EOF
203214
EOF
204215
$HCPKG list --simple-output --names-only | perl -ne 'for (split /\s+/) { print "constraints: any.$_ installed\n" unless /^(integer-logarithms)$/; }' >> cabal.project.local

cabal.project

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,3 +3,9 @@ tests: True
33

44
-- helpful with GHC HEAD
55
-- constraints: QuickCheck -templatehaskell
6+
7+
allow-newer: splitmix-0.1.3.1:base
8+
9+
if impl(ghc >=9.10)
10+
package integer-logarithms
11+
ghc-options: -Wunused-packages

integer-logarithms.cabal

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
name: integer-logarithms
2-
version: 1.0.4
2+
version: 1.0.5
33
cabal-version: >=1.10
44
author: Daniel Fischer
55
copyright:
@@ -31,8 +31,9 @@ tested-with:
3131
|| ==9.4.8
3232
|| ==9.6.6
3333
|| ==9.8.4
34-
|| ==9.10.1
35-
|| ==9.12.1
34+
|| ==9.10.2
35+
|| ==9.12.2
36+
|| ==9.14.1
3637

3738
extra-source-files:
3839
changelog.md
@@ -53,16 +54,14 @@ library
5354
hs-source-dirs: src
5455
build-depends:
5556
array >=0.5.3.0 && <0.6
56-
, base >=4.12.0.0 && <4.22
57-
, ghc-prim <0.14
57+
, base >=4.12.0.0 && <4.23
5858

5959
if !impl(ghc >=7.10)
6060
build-depends: nats >=1.1.2 && <1.2
6161

6262
if impl(ghc >=9.0)
6363
build-depends:
6464
base >=4.15
65-
, ghc-bignum >=1.0 && <1.4
6665

6766
if !flag(integer-gmp)
6867
build-depends: invalid-cabal-flag-settings <0
@@ -113,10 +112,9 @@ test-suite spec
113112
build-depends:
114113
base
115114
, integer-logarithms
116-
, QuickCheck >=2.14.1 && <2.16
115+
, QuickCheck >=2.14.1 && <2.18
117116
, smallcheck >=1.2 && <1.3
118117
, tasty >=1.4 && <1.6
119-
, tasty-hunit >=0.10 && <0.11
120118
, tasty-quickcheck >=0.10 && <0.12
121119
, tasty-smallcheck >=0.8 && <0.9
122120

0 commit comments

Comments
 (0)