Skip to content

Commit 329066c

Browse files
committed
Update Haskell CI
1 parent e1a2ae3 commit 329066c

2 files changed

Lines changed: 42 additions & 33 deletions

File tree

.github/workflows/haskell-ci.yml

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,14 +8,15 @@
88
#
99
# For more information, see https://github.com/haskell-CI/haskell-ci
1010
#
11-
# version: 0.19.20250506
11+
# version: 0.19.20251105
1212
#
13-
# REGENDATA ("0.19.20250506",["github","Spintax.cabal"])
13+
# REGENDATA ("0.19.20251105",["github","Spintax.cabal"])
1414
#
1515
name: Haskell-CI
1616
on:
1717
- push
1818
- pull_request
19+
- merge_group
1920
jobs:
2021
linux:
2122
name: Haskell-CI - Linux - ${{ matrix.compiler }}
@@ -86,8 +87,8 @@ jobs:
8687
chmod a+x "$HOME/.ghcup/bin/ghcup"
8788
- name: Install cabal-install
8889
run: |
89-
"$HOME/.ghcup/bin/ghcup" install cabal 3.14.2.0 || (cat "$HOME"/.ghcup/logs/*.* && false)
90-
echo "CABAL=$HOME/.ghcup/bin/cabal-3.14.2.0 -vnormal+nowrap" >> "$GITHUB_ENV"
90+
"$HOME/.ghcup/bin/ghcup" install cabal 3.16.0.0 || (cat "$HOME"/.ghcup/logs/*.* && false)
91+
echo "CABAL=$HOME/.ghcup/bin/cabal-3.16.0.0 -vnormal+nowrap" >> "$GITHUB_ENV"
9192
- name: Install GHC (GHCup)
9293
if: matrix.setup-method == 'ghcup'
9394
run: |
@@ -163,7 +164,7 @@ jobs:
163164
chmod a+x $HOME/.cabal/bin/cabal-plan
164165
cabal-plan --version
165166
- name: checkout
166-
uses: actions/checkout@v4
167+
uses: actions/checkout@v5
167168
with:
168169
path: source
169170
- name: initial cabal.project for sdist
@@ -188,7 +189,11 @@ jobs:
188189
touch cabal.project.local
189190
echo "packages: ${PKGDIR_Spintax}" >> cabal.project
190191
echo "package Spintax" >> cabal.project
191-
echo " ghc-options: -Werror=missing-methods" >> cabal.project
192+
echo " ghc-options: -Werror=missing-methods -Werror=missing-fields" >> cabal.project
193+
if [ $((HCNUMVER >= 90400)) -ne 0 ] ; then echo "package Spintax" >> cabal.project ; fi
194+
if [ $((HCNUMVER >= 90400)) -ne 0 ] ; then echo " ghc-options: -Werror=unused-packages" >> cabal.project ; fi
195+
if [ $((HCNUMVER >= 90000)) -ne 0 ] ; then echo "package Spintax" >> cabal.project ; fi
196+
if [ $((HCNUMVER >= 90000)) -ne 0 ] ; then echo " ghc-options: -Werror=incomplete-patterns -Werror=incomplete-uni-patterns" >> cabal.project ; fi
192197
cat >> cabal.project <<EOF
193198
EOF
194199
$HCPKG list --simple-output --names-only | perl -ne 'for (split /\s+/) { print "constraints: any.$_ installed\n" unless /^(Spintax)$/; }' >> cabal.project.local

Spintax.cabal

Lines changed: 31 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,19 @@
1-
name: Spintax
2-
version: 0.3.7.0
3-
synopsis: Random text generation based on spintax
4-
description: Random text generation based on spintax with nested alternatives and empty options.
5-
homepage: https://github.com/MichelBoucey/spintax
6-
license: BSD3
7-
license-file: LICENSE
8-
author: Michel Boucey
9-
maintainer: michel.boucey@gmail.com
10-
copyright: (c) 2016-2025 - Michel Boucey
11-
category: Text
12-
build-type: Simple
13-
cabal-version: >=1.10
1+
name: Spintax
2+
version: 0.3.7.0
3+
synopsis: Random text generation based on spintax
4+
description:
5+
Random text generation based on spintax with nested alternatives and empty options.
146

15-
Tested-With:
7+
homepage: https://github.com/MichelBoucey/spintax
8+
license: BSD3
9+
license-file: LICENSE
10+
author: Michel Boucey
11+
maintainer: michel.boucey@gmail.com
12+
copyright: (c) 2016-2025 - Michel Boucey
13+
category: Text
14+
build-type: Simple
15+
cabal-version: >=1.10
16+
tested-with:
1617
GHC ==8.8.4
1718
|| ==8.10.7
1819
|| ==9.0.2
@@ -24,21 +25,24 @@ Tested-With:
2425
|| ==9.12.2
2526

2627
library
27-
hs-source-dirs: src/
28+
hs-source-dirs: src/
2829
default-extensions: OverloadedStrings
29-
exposed-modules: Text.Spintax
30-
, Text.Spintax.RandomPhrase
31-
build-depends: attoparsec >= 0.12.1.6 && < 0.15
32-
, base >= 4.7 && < 5
33-
, either >= 5 && < 6
34-
, extra >= 1.4.3 && < 1.9
35-
, mtl >= 2.2.1 && < 2.4
36-
, mwc-random >= 0.13.3.2 && < 0.16
37-
, text >=1.1 && < 2.2
38-
default-language: Haskell2010
39-
GHC-Options: -Wall
30+
exposed-modules:
31+
Text.Spintax
32+
Text.Spintax.RandomPhrase
33+
34+
build-depends:
35+
attoparsec >=0.12.1.6 && <0.15
36+
, base >=4.7 && <5
37+
, either >=5 && <6
38+
, extra >=1.4.3 && <1.9
39+
, mtl >=2.2.1 && <2.4
40+
, mwc-random >=0.13.3.2 && <0.16
41+
, text >=1.1 && <2.2
42+
43+
default-language: Haskell2010
44+
ghc-options: -Wall
4045

4146
source-repository head
4247
type: git
4348
location: https://github.com/MichelBoucey/spintax
44-

0 commit comments

Comments
 (0)