Skip to content

Commit 10ec867

Browse files
authored
Merge pull request #111 from haskellari/update-ci-2025-09-17
Update CI, cleanups
2 parents 87a4147 + 00d2ee9 commit 10ec867

File tree

3 files changed

+10
-14
lines changed

3 files changed

+10
-14
lines changed

.github/workflows/haskell-ci.yml

Lines changed: 10 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.20250605
11+
# version: 0.19.20250916
1212
#
13-
# REGENDATA ("0.19.20250605",["github","cabal.project"])
13+
# REGENDATA ("0.19.20250916",["github","cabal.project"])
1414
#
1515
name: Haskell-CI
1616
on:
@@ -96,8 +96,8 @@ jobs:
9696
chmod a+x "$HOME/.ghcup/bin/ghcup"
9797
- name: Install cabal-install
9898
run: |
99-
"$HOME/.ghcup/bin/ghcup" install cabal 3.14.2.0 || (cat "$HOME"/.ghcup/logs/*.* && false)
100-
echo "CABAL=$HOME/.ghcup/bin/cabal-3.14.2.0 -vnormal+nowrap" >> "$GITHUB_ENV"
99+
"$HOME/.ghcup/bin/ghcup" install cabal 3.16.0.0 || (cat "$HOME"/.ghcup/logs/*.* && false)
100+
echo "CABAL=$HOME/.ghcup/bin/cabal-3.16.0.0 -vnormal+nowrap" >> "$GITHUB_ENV"
101101
- name: Install GHC (GHCup)
102102
if: matrix.setup-method == 'ghcup'
103103
run: |
@@ -182,7 +182,7 @@ jobs:
182182
chmod a+x $HOME/.cabal/bin/cabal-docspec
183183
cabal-docspec --version
184184
- name: checkout
185-
uses: actions/checkout@v4
185+
uses: actions/checkout@v5
186186
with:
187187
path: source
188188
- name: initial cabal.project for sdist
@@ -207,11 +207,12 @@ jobs:
207207
touch cabal.project.local
208208
echo "packages: ${PKGDIR_splitmix}" >> cabal.project
209209
echo "package splitmix" >> cabal.project
210-
echo " ghc-options: -Werror=missing-methods" >> cabal.project
210+
echo " ghc-options: -Werror=missing-methods -Werror=missing-fields" >> cabal.project
211+
if [ $((HCNUMVER >= 90400)) -ne 0 ] ; then echo "package splitmix" >> cabal.project ; fi
212+
if [ $((HCNUMVER >= 90400)) -ne 0 ] ; then echo " ghc-options: -Werror=unused-packages" >> cabal.project ; fi
213+
if [ $((HCNUMVER >= 90000)) -ne 0 ] ; then echo "package splitmix" >> cabal.project ; fi
214+
if [ $((HCNUMVER >= 90000)) -ne 0 ] ; then echo " ghc-options: -Werror=incomplete-patterns -Werror=incomplete-uni-patterns" >> cabal.project ; fi
211215
cat >> cabal.project <<EOF
212-
allow-newer: async-2.2.5:base
213-
allow-newer: hashable-1.4.4.0:base
214-
allow-newer: hashable-1.4.4.0:containers
215216
EOF
216217
$HCPKG list --simple-output --names-only | perl -ne 'for (split /\s+/) { print "constraints: any.$_ installed\n" unless /^(splitmix)$/; }' >> cabal.project.local
217218
cat cabal.project

cabal.project

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,3 @@
11
packages: .
22

33
tests: True
4-
5-
allow-newer: async-2.2.5:base
6-
allow-newer: hashable-1.4.4.0:base
7-
allow-newer: hashable-1.4.4.0:containers

splitmix.cabal

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -208,7 +208,6 @@ test-suite splitmix-dieharder
208208
, bytestring >=0.10.8.2 && <0.13
209209
, deepseq
210210
, process >=1.6.0.0 && <1.7
211-
, random
212211
, splitmix
213212
, tf-random >=0.5 && <0.6
214213
, vector >=0.13.0.0 && <0.14

0 commit comments

Comments
 (0)