Skip to content

Commit bc0a3e2

Browse files
authored
Merge pull request #31 from haskellari/ghc-9.14
Support GHC-9.14
2 parents b9f9979 + 2236305 commit bc0a3e2

File tree

3 files changed

+33
-20
lines changed

3 files changed

+33
-20
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.20260102
1212
#
13-
# REGENDATA ("0.19.20241220",["github","cabal.project"])
13+
# REGENDATA ("0.19.20260102",["github","cabal.project"])
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.6.4
@@ -86,13 +94,12 @@ jobs:
8694
- name: Install GHCup
8795
run: |
8896
mkdir -p "$HOME/.ghcup/bin"
89-
curl -sL https://downloads.haskell.org/ghcup/0.1.30.0/x86_64-linux-ghcup-0.1.30.0 > "$HOME/.ghcup/bin/ghcup"
97+
curl -sL https://downloads.haskell.org/ghcup/0.1.50.1/x86_64-linux-ghcup-0.1.50.1 > "$HOME/.ghcup/bin/ghcup"
9098
chmod a+x "$HOME/.ghcup/bin/ghcup"
91-
- name: Install cabal-install (prerelease)
99+
- name: Install cabal-install
92100
run: |
93-
"$HOME/.ghcup/bin/ghcup" config add-release-channel https://raw.githubusercontent.com/haskell/ghcup-metadata/master/ghcup-prereleases-0.0.8.yaml;
94-
"$HOME/.ghcup/bin/ghcup" install cabal 3.15.0.0.2024.10.3 || (cat "$HOME"/.ghcup/logs/*.* && false)
95-
echo "CABAL=$HOME/.ghcup/bin/cabal-3.15.0.0.2024.10.3 -vnormal+nowrap" >> "$GITHUB_ENV"
101+
"$HOME/.ghcup/bin/ghcup" install cabal 3.16.0.0 || (cat "$HOME"/.ghcup/logs/*.* && false)
102+
echo "CABAL=$HOME/.ghcup/bin/cabal-3.16.0.0 -vnormal+nowrap" >> "$GITHUB_ENV"
96103
- name: Install GHC (GHCup)
97104
if: matrix.setup-method == 'ghcup'
98105
run: |
@@ -168,7 +175,7 @@ jobs:
168175
chmod a+x $HOME/.cabal/bin/cabal-plan
169176
cabal-plan --version
170177
- name: checkout
171-
uses: actions/checkout@v4
178+
uses: actions/checkout@v5
172179
with:
173180
path: source
174181
- name: initial cabal.project for sdist
@@ -193,7 +200,11 @@ jobs:
193200
touch cabal.project.local
194201
echo "packages: ${PKGDIR_OneTuple}" >> cabal.project
195202
echo "package OneTuple" >> cabal.project
196-
echo " ghc-options: -Werror=missing-methods" >> cabal.project
203+
echo " ghc-options: -Werror=missing-methods -Werror=missing-fields" >> cabal.project
204+
if [ $((HCNUMVER >= 90400)) -ne 0 ] ; then echo "package OneTuple" >> cabal.project ; fi
205+
if [ $((HCNUMVER >= 90400)) -ne 0 ] ; then echo " ghc-options: -Werror=unused-packages" >> cabal.project ; fi
206+
if [ $((HCNUMVER >= 90000)) -ne 0 ] ; then echo "package OneTuple" >> cabal.project ; fi
207+
if [ $((HCNUMVER >= 90000)) -ne 0 ] ; then echo " ghc-options: -Werror=incomplete-patterns -Werror=incomplete-uni-patterns" >> cabal.project ; fi
197208
cat >> cabal.project <<EOF
198209
EOF
199210
$HCPKG list --simple-output --names-only | perl -ne 'for (split /\s+/) { print "constraints: any.$_ installed\n" unless /^(OneTuple)$/; }' >> cabal.project.local

OneTuple.cabal

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
cabal-version: 1.12
22
name: OneTuple
3-
version: 0.4.2
4-
x-revision: 1
3+
version: 0.4.2.1
54
synopsis: Singleton Tuple
65
category: Data
76
description:
@@ -31,8 +30,9 @@ tested-with:
3130
|| ==9.4.8
3231
|| ==9.6.4
3332
|| ==9.8.6
34-
|| ==9.10.1
35-
|| ==9.12.1
33+
|| ==9.10.2
34+
|| ==9.12.2
35+
|| ==9.14.1
3636

3737
extra-source-files: Changelog.md
3838

@@ -49,7 +49,7 @@ library
4949

5050
hs-source-dirs: src
5151
build-depends:
52-
base >=4.12 && <4.22
52+
base >=4.12 && <4.23
5353
, template-haskell
5454

5555
if impl(ghc >=9.0)
@@ -90,4 +90,3 @@ test-suite th
9090
build-depends:
9191
base
9292
, OneTuple
93-
, template-haskell

cabal.project

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,5 @@
11
packages: .
22
tests: True
3+
4+
package OneTuple
5+
ghc-options: -Wunused-packages

0 commit comments

Comments
 (0)