Skip to content

Commit 6d3d0ab

Browse files
committed
Regenerate CI
1 parent cb76985 commit 6d3d0ab

File tree

2 files changed

+37
-24
lines changed

2 files changed

+37
-24
lines changed

.github/workflows/haskell-ci.yml

Lines changed: 30 additions & 20 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.20240702
11+
# version: 0.19.20250330
1212
#
13-
# REGENDATA ("0.19.20240702",["github","text-builder-linear.cabal"])
13+
# REGENDATA ("0.19.20250330",["github","text-builder-linear.cabal"])
1414
#
1515
name: Haskell-CI
1616
on:
@@ -19,7 +19,7 @@ on:
1919
jobs:
2020
linux:
2121
name: Haskell-CI - Linux - ${{ matrix.compiler }}
22-
runs-on: ubuntu-20.04
22+
runs-on: ubuntu-24.04
2323
timeout-minutes:
2424
60
2525
container:
@@ -28,19 +28,24 @@ jobs:
2828
strategy:
2929
matrix:
3030
include:
31+
- compiler: ghc-9.12.1
32+
compilerKind: ghc
33+
compilerVersion: 9.12.1
34+
setup-method: ghcup
35+
allow-failure: false
3136
- compiler: ghc-9.10.1
3237
compilerKind: ghc
3338
compilerVersion: 9.10.1
3439
setup-method: ghcup
3540
allow-failure: false
36-
- compiler: ghc-9.8.2
41+
- compiler: ghc-9.8.4
3742
compilerKind: ghc
38-
compilerVersion: 9.8.2
43+
compilerVersion: 9.8.4
3944
setup-method: ghcup
4045
allow-failure: false
41-
- compiler: ghc-9.6.6
46+
- compiler: ghc-9.6.7
4247
compilerKind: ghc
43-
compilerVersion: 9.6.6
48+
compilerVersion: 9.6.7
4449
setup-method: ghcup
4550
allow-failure: false
4651
- compiler: ghc-9.4.8
@@ -55,15 +60,29 @@ jobs:
5560
allow-failure: false
5661
fail-fast: false
5762
steps:
58-
- name: apt
63+
- name: apt-get install
5964
run: |
6065
apt-get update
6166
apt-get install -y --no-install-recommends gnupg ca-certificates dirmngr curl git software-properties-common libtinfo5
67+
- name: Install GHCup
68+
run: |
6269
mkdir -p "$HOME/.ghcup/bin"
63-
curl -sL https://downloads.haskell.org/ghcup/0.1.20.0/x86_64-linux-ghcup-0.1.20.0 > "$HOME/.ghcup/bin/ghcup"
70+
curl -sL https://downloads.haskell.org/ghcup/0.1.50.1/x86_64-linux-ghcup-0.1.50.1 > "$HOME/.ghcup/bin/ghcup"
6471
chmod a+x "$HOME/.ghcup/bin/ghcup"
72+
- name: Install cabal-install
73+
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"
76+
- name: Install GHC (GHCup)
77+
if: matrix.setup-method == 'ghcup'
78+
run: |
6579
"$HOME/.ghcup/bin/ghcup" install ghc "$HCVER" || (cat "$HOME"/.ghcup/logs/*.* && false)
66-
"$HOME/.ghcup/bin/ghcup" install cabal 3.12.1.0 || (cat "$HOME"/.ghcup/logs/*.* && false)
80+
HC=$("$HOME/.ghcup/bin/ghcup" whereis ghc "$HCVER")
81+
HCPKG=$(echo "$HC" | sed 's#ghc$#ghc-pkg#')
82+
HADDOCK=$(echo "$HC" | sed 's#ghc$#haddock#')
83+
echo "HC=$HC" >> "$GITHUB_ENV"
84+
echo "HCPKG=$HCPKG" >> "$GITHUB_ENV"
85+
echo "HADDOCK=$HADDOCK" >> "$GITHUB_ENV"
6786
env:
6887
HCKIND: ${{ matrix.compilerKind }}
6988
HCNAME: ${{ matrix.compiler }}
@@ -74,21 +93,12 @@ jobs:
7493
echo "LANG=C.UTF-8" >> "$GITHUB_ENV"
7594
echo "CABAL_DIR=$HOME/.cabal" >> "$GITHUB_ENV"
7695
echo "CABAL_CONFIG=$HOME/.cabal/config" >> "$GITHUB_ENV"
77-
HCDIR=/opt/$HCKIND/$HCVER
78-
HC=$("$HOME/.ghcup/bin/ghcup" whereis ghc "$HCVER")
79-
HCPKG=$(echo "$HC" | sed 's#ghc$#ghc-pkg#')
80-
HADDOCK=$(echo "$HC" | sed 's#ghc$#haddock#')
81-
echo "HC=$HC" >> "$GITHUB_ENV"
82-
echo "HCPKG=$HCPKG" >> "$GITHUB_ENV"
83-
echo "HADDOCK=$HADDOCK" >> "$GITHUB_ENV"
84-
echo "CABAL=$HOME/.ghcup/bin/cabal-3.12.1.0 -vnormal+nowrap" >> "$GITHUB_ENV"
8596
HCNUMVER=$(${HC} --numeric-version|perl -ne '/^(\d+)\.(\d+)\.(\d+)(\.(\d+))?$/; print(10000 * $1 + 100 * $2 + ($3 == 0 ? $5 != 1 : $3))')
8697
echo "HCNUMVER=$HCNUMVER" >> "$GITHUB_ENV"
8798
echo "ARG_TESTS=--enable-tests" >> "$GITHUB_ENV"
8899
echo "ARG_BENCH=--enable-benchmarks" >> "$GITHUB_ENV"
89100
echo "HEADHACKAGE=false" >> "$GITHUB_ENV"
90101
echo "ARG_COMPILER=--$HCKIND --with-compiler=$HC" >> "$GITHUB_ENV"
91-
echo "GHCJSARITH=0" >> "$GITHUB_ENV"
92102
env:
93103
HCKIND: ${{ matrix.compilerKind }}
94104
HCNAME: ${{ matrix.compiler }}
@@ -204,8 +214,8 @@ jobs:
204214
rm -f cabal.project.local
205215
$CABAL v2-build $ARG_COMPILER --disable-tests --disable-benchmarks all
206216
- name: save cache
207-
uses: actions/cache/save@v4
208217
if: always()
218+
uses: actions/cache/save@v4
209219
with:
210220
key: ${{ runner.os }}-${{ matrix.compiler }}-${{ github.sha }}
211221
path: ~/.cabal/store

text-builder-linear.cabal

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,10 @@ 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.8 ghc ==9.6.6 ghc ==9.8.2 ghc ==9.10.1
9+
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
12+
1013
homepage: https://github.com/Bodigrim/linear-builder
1114
synopsis: Builder for Text and ByteString based on linear types
1215
description:
@@ -48,7 +51,7 @@ library
4851
base >=4.16 && <5,
4952
text >=2.0 && <2.2,
5053
bytestring >=0.11 && <0.13,
51-
ghc-bignum >=1.1 && < 2.0,
54+
ghc-bignum >=1.1 && <2.0,
5255
quote-quot >=0.2.1 && <0.3
5356

5457
test-suite linear-builder-tests
@@ -57,8 +60,8 @@ test-suite linear-builder-tests
5760
hs-source-dirs: test
5861
default-language: GHC2021
5962
default-extensions:
60-
DerivingStrategies LinearTypes MagicHash NumDecimals PatternSynonyms
61-
UnboxedTuples UnicodeSyntax
63+
DerivingStrategies LinearTypes MagicHash NumDecimals
64+
PatternSynonyms UnboxedTuples UnicodeSyntax
6265

6366
ghc-options:
6467
-Wall -Wno-orphans -threaded -rtsopts "-with-rtsopts -N"

0 commit comments

Comments
 (0)