Skip to content

Commit 111a09a

Browse files
committed
Regenerate CI
1 parent 5865250 commit 111a09a

File tree

4 files changed

+29
-24
lines changed

4 files changed

+29
-24
lines changed

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,19 +11,19 @@ jobs:
1111
bounds-checking:
1212
runs-on: ubuntu-latest
1313
steps:
14-
- uses: actions/checkout@v3
15-
- uses: haskell/actions/setup@v2
14+
- uses: actions/checkout@v4
15+
- uses: haskell-actions/setup@v2
1616
id: setup-haskell-cabal
1717
with:
18-
ghc-version: "9.6.2"
18+
ghc-version: "9.10.1"
1919
- name: Update cabal package database
2020
run: cabal update
21-
- uses: actions/cache@v3
21+
- uses: actions/cache@v4
2222
name: Cache cabal stuff
2323
with:
2424
path: |
2525
${{ steps.setup-haskell-cabal.outputs.cabal-store }}
2626
dist-newstyle
27-
key: ${{ runner.os }}-9.6.2
27+
key: ${{ runner.os }}-9.10.1
2828
- name: Test
2929
run: cabal test --ghc-options='-fcheck-prim-bounds -fno-ignore-asserts' --constraint 'text +developer'

.github/workflows/fourmolu.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@ jobs:
44
format:
55
runs-on: ubuntu-latest
66
steps:
7-
- uses: actions/checkout@v3
8-
- uses: fourmolu/fourmolu-action@v9
7+
- uses: actions/checkout@v4
8+
- uses: fourmolu/fourmolu-action@v10
99
with:
1010
pattern: |
1111
src/**/*.hs

.github/workflows/haskell-ci.yml

Lines changed: 21 additions & 16 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.17.20231010
11+
# version: 0.19.20240702
1212
#
13-
# REGENDATA ("0.17.20231010",["github","text-builder-linear.cabal"])
13+
# REGENDATA ("0.19.20240702",["github","text-builder-linear.cabal"])
1414
#
1515
name: Haskell-CI
1616
on:
@@ -23,24 +23,29 @@ jobs:
2323
timeout-minutes:
2424
60
2525
container:
26-
image: buildpack-deps:bionic
26+
image: buildpack-deps:jammy
2727
continue-on-error: ${{ matrix.allow-failure }}
2828
strategy:
2929
matrix:
3030
include:
31-
- compiler: ghc-9.8.1
31+
- compiler: ghc-9.10.1
3232
compilerKind: ghc
33-
compilerVersion: 9.8.1
33+
compilerVersion: 9.10.1
3434
setup-method: ghcup
3535
allow-failure: false
36-
- compiler: ghc-9.6.3
36+
- compiler: ghc-9.8.2
3737
compilerKind: ghc
38-
compilerVersion: 9.6.3
38+
compilerVersion: 9.8.2
3939
setup-method: ghcup
4040
allow-failure: false
41-
- compiler: ghc-9.4.7
41+
- compiler: ghc-9.6.6
4242
compilerKind: ghc
43-
compilerVersion: 9.4.7
43+
compilerVersion: 9.6.6
44+
setup-method: ghcup
45+
allow-failure: false
46+
- compiler: ghc-9.4.8
47+
compilerKind: ghc
48+
compilerVersion: 9.4.8
4449
setup-method: ghcup
4550
allow-failure: false
4651
- compiler: ghc-9.2.8
@@ -55,10 +60,10 @@ jobs:
5560
apt-get update
5661
apt-get install -y --no-install-recommends gnupg ca-certificates dirmngr curl git software-properties-common libtinfo5
5762
mkdir -p "$HOME/.ghcup/bin"
58-
curl -sL https://downloads.haskell.org/ghcup/0.1.19.5/x86_64-linux-ghcup-0.1.19.5 > "$HOME/.ghcup/bin/ghcup"
63+
curl -sL https://downloads.haskell.org/ghcup/0.1.20.0/x86_64-linux-ghcup-0.1.20.0 > "$HOME/.ghcup/bin/ghcup"
5964
chmod a+x "$HOME/.ghcup/bin/ghcup"
6065
"$HOME/.ghcup/bin/ghcup" install ghc "$HCVER" || (cat "$HOME"/.ghcup/logs/*.* && false)
61-
"$HOME/.ghcup/bin/ghcup" install cabal 3.10.1.0 || (cat "$HOME"/.ghcup/logs/*.* && false)
66+
"$HOME/.ghcup/bin/ghcup" install cabal 3.12.1.0 || (cat "$HOME"/.ghcup/logs/*.* && false)
6267
env:
6368
HCKIND: ${{ matrix.compilerKind }}
6469
HCNAME: ${{ matrix.compiler }}
@@ -76,7 +81,7 @@ jobs:
7681
echo "HC=$HC" >> "$GITHUB_ENV"
7782
echo "HCPKG=$HCPKG" >> "$GITHUB_ENV"
7883
echo "HADDOCK=$HADDOCK" >> "$GITHUB_ENV"
79-
echo "CABAL=$HOME/.ghcup/bin/cabal-3.10.1.0 -vnormal+nowrap" >> "$GITHUB_ENV"
84+
echo "CABAL=$HOME/.ghcup/bin/cabal-3.12.1.0 -vnormal+nowrap" >> "$GITHUB_ENV"
8085
HCNUMVER=$(${HC} --numeric-version|perl -ne '/^(\d+)\.(\d+)\.(\d+)(\.(\d+))?$/; print(10000 * $1 + 100 * $2 + ($3 == 0 ? $5 != 1 : $3))')
8186
echo "HCNUMVER=$HCNUMVER" >> "$GITHUB_ENV"
8287
echo "ARG_TESTS=--enable-tests" >> "$GITHUB_ENV"
@@ -133,7 +138,7 @@ jobs:
133138
chmod a+x $HOME/.cabal/bin/cabal-plan
134139
cabal-plan --version
135140
- name: checkout
136-
uses: actions/checkout@v3
141+
uses: actions/checkout@v4
137142
with:
138143
path: source
139144
- name: initial cabal.project for sdist
@@ -161,15 +166,15 @@ jobs:
161166
echo " ghc-options: -Werror=missing-methods" >> cabal.project
162167
cat >> cabal.project <<EOF
163168
EOF
164-
$HCPKG list --simple-output --names-only | perl -ne 'for (split /\s+/) { print "constraints: $_ installed\n" unless /^(text|text-builder-linear)$/; }' >> cabal.project.local
169+
$HCPKG list --simple-output --names-only | perl -ne 'for (split /\s+/) { print "constraints: any.$_ installed\n" unless /^(text|text-builder-linear)$/; }' >> cabal.project.local
165170
cat cabal.project
166171
cat cabal.project.local
167172
- name: dump install plan
168173
run: |
169174
$CABAL v2-build $ARG_COMPILER $ARG_TESTS $ARG_BENCH --dry-run all
170175
cabal-plan
171176
- name: restore cache
172-
uses: actions/cache/restore@v3
177+
uses: actions/cache/restore@v4
173178
with:
174179
key: ${{ runner.os }}-${{ matrix.compiler }}-${{ github.sha }}
175180
path: ~/.cabal/store
@@ -199,7 +204,7 @@ jobs:
199204
rm -f cabal.project.local
200205
$CABAL v2-build $ARG_COMPILER --disable-tests --disable-benchmarks all
201206
- name: save cache
202-
uses: actions/cache/save@v3
207+
uses: actions/cache/save@v4
203208
if: always()
204209
with:
205210
key: ${{ runner.os }}-${{ matrix.compiler }}-${{ github.sha }}

text-builder-linear.cabal

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ license-file: LICENSE
66
copyright: 2022 Andrew Lelechenko
77
maintainer: Andrew Lelechenko <[email protected]>
88
author: Andrew Lelechenko
9-
tested-with: ghc ==9.2.8 ghc ==9.4.7 ghc ==9.6.3 ghc ==9.8.1
9+
tested-with: ghc ==9.2.8 ghc ==9.4.8 ghc ==9.6.6 ghc ==9.8.2 ghc ==9.10.1
1010
homepage: https://github.com/Bodigrim/linear-builder
1111
synopsis: Builder for Text and ByteString based on linear types
1212
description:

0 commit comments

Comments
 (0)