Skip to content

Commit ab3b13a

Browse files
committed
Regenerate CI
1 parent 0d72be1 commit ab3b13a

File tree

4 files changed

+53
-15
lines changed

4 files changed

+53
-15
lines changed

.github/workflows/check-prim-bounds.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ jobs:
1515
- uses: haskell-actions/setup@v2
1616
id: setup-haskell-cabal
1717
with:
18-
ghc-version: "9.10.1"
18+
ghc-version: "9.10.2"
1919
- name: Update cabal package database
2020
run: cabal update
2121
- uses: actions/cache@v4
@@ -24,6 +24,6 @@ jobs:
2424
path: |
2525
${{ steps.setup-haskell-cabal.outputs.cabal-store }}
2626
dist-newstyle
27-
key: ${{ runner.os }}-9.10.1
27+
key: ${{ runner.os }}-9.10.2
2828
- name: Test
2929
run: cabal test --ghc-options='-fcheck-prim-bounds -fno-ignore-asserts' --constraint 'text +developer'

.github/workflows/fourmolu.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ jobs:
55
runs-on: ubuntu-latest
66
steps:
77
- uses: actions/checkout@v4
8-
- uses: fourmolu/fourmolu-action@v10
8+
- uses: haskell-actions/run-fourmolu@v11
99
with:
1010
pattern: |
1111
src/**/*.hs

.github/workflows/haskell-ci.yml

Lines changed: 48 additions & 10 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.20250821
1212
#
13-
# REGENDATA ("0.19.20250330",["github","text-builder-linear.cabal"])
13+
# REGENDATA ("0.19.20250821",["github","text-builder-linear.cabal"])
1414
#
1515
name: Haskell-CI
1616
on:
@@ -28,14 +28,19 @@ jobs:
2828
strategy:
2929
matrix:
3030
include:
31-
- compiler: ghc-9.12.1
31+
- compiler: ghc-9.14.0.20250819
3232
compilerKind: ghc
33-
compilerVersion: 9.12.1
33+
compilerVersion: 9.14.0.20250819
34+
setup-method: ghcup-prerelease
35+
allow-failure: false
36+
- compiler: ghc-9.12.2
37+
compilerKind: ghc
38+
compilerVersion: 9.12.2
3439
setup-method: ghcup
3540
allow-failure: false
36-
- compiler: ghc-9.10.1
41+
- compiler: ghc-9.10.2
3742
compilerKind: ghc
38-
compilerVersion: 9.10.1
43+
compilerVersion: 9.10.2
3944
setup-method: ghcup
4045
allow-failure: false
4146
- compiler: ghc-9.8.4
@@ -71,8 +76,8 @@ jobs:
7176
chmod a+x "$HOME/.ghcup/bin/ghcup"
7277
- name: Install cabal-install
7378
run: |
74-
"$HOME/.ghcup/bin/ghcup" install cabal 3.14.1.1-p1 || (cat "$HOME"/.ghcup/logs/*.* && false)
75-
echo "CABAL=$HOME/.ghcup/bin/cabal-3.14.1.1-p1 -vnormal+nowrap" >> "$GITHUB_ENV"
79+
"$HOME/.ghcup/bin/ghcup" install cabal 3.16.0.0 || (cat "$HOME"/.ghcup/logs/*.* && false)
80+
echo "CABAL=$HOME/.ghcup/bin/cabal-3.16.0.0 -vnormal+nowrap" >> "$GITHUB_ENV"
7681
- name: Install GHC (GHCup)
7782
if: matrix.setup-method == 'ghcup'
7883
run: |
@@ -87,6 +92,21 @@ jobs:
8792
HCKIND: ${{ matrix.compilerKind }}
8893
HCNAME: ${{ matrix.compiler }}
8994
HCVER: ${{ matrix.compilerVersion }}
95+
- name: Install GHC (GHCup prerelease)
96+
if: matrix.setup-method == 'ghcup-prerelease'
97+
run: |
98+
"$HOME/.ghcup/bin/ghcup" config add-release-channel prereleases
99+
"$HOME/.ghcup/bin/ghcup" install ghc "$HCVER" || (cat "$HOME"/.ghcup/logs/*.* && false)
100+
HC=$("$HOME/.ghcup/bin/ghcup" whereis ghc "$HCVER")
101+
HCPKG=$(echo "$HC" | sed 's#ghc$#ghc-pkg#')
102+
HADDOCK=$(echo "$HC" | sed 's#ghc$#haddock#')
103+
echo "HC=$HC" >> "$GITHUB_ENV"
104+
echo "HCPKG=$HCPKG" >> "$GITHUB_ENV"
105+
echo "HADDOCK=$HADDOCK" >> "$GITHUB_ENV"
106+
env:
107+
HCKIND: ${{ matrix.compilerKind }}
108+
HCNAME: ${{ matrix.compiler }}
109+
HCVER: ${{ matrix.compilerVersion }}
90110
- name: Set PATH and environment variables
91111
run: |
92112
echo "$HOME/.cabal/bin" >> $GITHUB_PATH
@@ -97,7 +117,7 @@ jobs:
97117
echo "HCNUMVER=$HCNUMVER" >> "$GITHUB_ENV"
98118
echo "ARG_TESTS=--enable-tests" >> "$GITHUB_ENV"
99119
echo "ARG_BENCH=--enable-benchmarks" >> "$GITHUB_ENV"
100-
echo "HEADHACKAGE=false" >> "$GITHUB_ENV"
120+
if [ $((HCNUMVER >= 91400)) -ne 0 ] ; then echo "HEADHACKAGE=true" >> "$GITHUB_ENV" ; else echo "HEADHACKAGE=false" >> "$GITHUB_ENV" ; fi
101121
echo "ARG_COMPILER=--$HCKIND --with-compiler=$HC" >> "$GITHUB_ENV"
102122
env:
103123
HCKIND: ${{ matrix.compilerKind }}
@@ -125,6 +145,18 @@ jobs:
125145
repository hackage.haskell.org
126146
url: http://hackage.haskell.org/
127147
EOF
148+
if $HEADHACKAGE; then
149+
cat >> $CABAL_CONFIG <<EOF
150+
repository head.hackage.ghc.haskell.org
151+
url: https://ghc.gitlab.haskell.org/head.hackage/
152+
secure: True
153+
root-keys: 7541f32a4ccca4f97aea3b22f5e593ba2c0267546016b992dfadcd2fe944e55d
154+
26021a13b401500c8eb2761ca95c61f2d625bfef951b939a8124ed12ecf07329
155+
f76d08be13e9a61a377a85e2fb63f4c5435d40f8feb3e12eb05905edb8cdea89
156+
key-threshold: 3
157+
active-repositories: hackage.haskell.org, head.hackage.ghc.haskell.org:override
158+
EOF
159+
fi
128160
cat >> $CABAL_CONFIG <<EOF
129161
program-default-options
130162
ghc-options: $GHCJOBS +RTS -M3G -RTS
@@ -173,9 +205,15 @@ jobs:
173205
touch cabal.project.local
174206
echo "packages: ${PKGDIR_text_builder_linear}" >> cabal.project
175207
echo "package text-builder-linear" >> cabal.project
176-
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 text-builder-linear" >> cabal.project ; fi
210+
echo "package text-builder-linear" >> cabal.project
211+
echo " ghc-options: -Werror=incomplete-patterns -Werror=incomplete-uni-patterns" >> cabal.project
177212
cat >> cabal.project <<EOF
178213
EOF
214+
if $HEADHACKAGE; then
215+
echo "allow-newer: $($HCPKG list --simple-output | sed -E 's/([a-zA-Z-]+)-[0-9.]+/*:\1,/g')" >> cabal.project
216+
fi
179217
$HCPKG list --simple-output --names-only | perl -ne 'for (split /\s+/) { print "constraints: any.$_ installed\n" unless /^(text|text-builder-linear)$/; }' >> cabal.project.local
180218
cat cabal.project
181219
cat cabal.project.local

text-builder-linear.cabal

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ copyright: 2022 Andrew Lelechenko
77
maintainer: Andrew Lelechenko <[email protected]>
88
author: Andrew Lelechenko
99
tested-with:
10-
ghc ==9.2.8 ghc ==9.4.8 ghc ==9.6.7 ghc ==9.8.4 ghc ==9.10.1
11-
ghc ==9.12.1
10+
ghc ==9.2.8 ghc ==9.4.8 ghc ==9.6.7 ghc ==9.8.4 ghc ==9.10.2
11+
ghc ==9.12.2 ghc ==9.14.1
1212

1313
homepage: https://github.com/Bodigrim/linear-builder
1414
synopsis: Builder for Text and ByteString based on linear types

0 commit comments

Comments
 (0)