Skip to content

Commit ee9d65a

Browse files
committed
Regenerate CI
1 parent 348b0de commit ee9d65a

File tree

4 files changed

+44
-31
lines changed

4 files changed

+44
-31
lines changed

.github/workflows/haskell-ci.yml

Lines changed: 32 additions & 22 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.20240708
11+
# version: 0.19.20250604
1212
#
13-
# REGENDATA ("0.19.20240708",["github","--config=cabal.haskell-ci","cabal.project"])
13+
# REGENDATA ("0.19.20250604",["github","--config=cabal.haskell-ci","cabal.project"])
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.10.1
31+
- compiler: ghc-9.12.2
3232
compilerKind: ghc
33-
compilerVersion: 9.10.1
33+
compilerVersion: 9.12.2
3434
setup-method: ghcup
3535
allow-failure: false
36-
- compiler: ghc-9.8.2
36+
- compiler: ghc-9.10.2
3737
compilerKind: ghc
38-
compilerVersion: 9.8.2
38+
compilerVersion: 9.10.2
3939
setup-method: ghcup
4040
allow-failure: false
41-
- compiler: ghc-9.6.6
41+
- compiler: ghc-9.8.4
4242
compilerKind: ghc
43-
compilerVersion: 9.6.6
43+
compilerVersion: 9.8.4
44+
setup-method: ghcup
45+
allow-failure: false
46+
- compiler: ghc-9.6.7
47+
compilerKind: ghc
48+
compilerVersion: 9.6.7
4449
setup-method: ghcup
4550
allow-failure: false
4651
- compiler: ghc-9.4.8
@@ -90,15 +95,29 @@ jobs:
9095
allow-failure: false
9196
fail-fast: false
9297
steps:
93-
- name: apt
98+
- name: apt-get install
9499
run: |
95100
apt-get update
96101
apt-get install -y --no-install-recommends gnupg ca-certificates dirmngr curl git software-properties-common libtinfo5 libnuma-dev
102+
- name: Install GHCup
103+
run: |
97104
mkdir -p "$HOME/.ghcup/bin"
98-
curl -sL https://downloads.haskell.org/ghcup/0.1.30.0/x86_64-linux-ghcup-0.1.30.0 > "$HOME/.ghcup/bin/ghcup"
105+
curl -sL https://downloads.haskell.org/ghcup/0.1.50.1/x86_64-linux-ghcup-0.1.50.1 > "$HOME/.ghcup/bin/ghcup"
99106
chmod a+x "$HOME/.ghcup/bin/ghcup"
107+
- name: Install cabal-install
108+
run: |
109+
"$HOME/.ghcup/bin/ghcup" install cabal 3.14.2.0 || (cat "$HOME"/.ghcup/logs/*.* && false)
110+
echo "CABAL=$HOME/.ghcup/bin/cabal-3.14.2.0 -vnormal+nowrap" >> "$GITHUB_ENV"
111+
- name: Install GHC (GHCup)
112+
if: matrix.setup-method == 'ghcup'
113+
run: |
100114
"$HOME/.ghcup/bin/ghcup" install ghc "$HCVER" || (cat "$HOME"/.ghcup/logs/*.* && false)
101-
"$HOME/.ghcup/bin/ghcup" install cabal 3.12.1.0 || (cat "$HOME"/.ghcup/logs/*.* && false)
115+
HC=$("$HOME/.ghcup/bin/ghcup" whereis ghc "$HCVER")
116+
HCPKG=$(echo "$HC" | sed 's#ghc$#ghc-pkg#')
117+
HADDOCK=$(echo "$HC" | sed 's#ghc$#haddock#')
118+
echo "HC=$HC" >> "$GITHUB_ENV"
119+
echo "HCPKG=$HCPKG" >> "$GITHUB_ENV"
120+
echo "HADDOCK=$HADDOCK" >> "$GITHUB_ENV"
102121
env:
103122
HCKIND: ${{ matrix.compilerKind }}
104123
HCNAME: ${{ matrix.compiler }}
@@ -109,21 +128,12 @@ jobs:
109128
echo "LANG=C.UTF-8" >> "$GITHUB_ENV"
110129
echo "CABAL_DIR=$HOME/.cabal" >> "$GITHUB_ENV"
111130
echo "CABAL_CONFIG=$HOME/.cabal/config" >> "$GITHUB_ENV"
112-
HCDIR=/opt/$HCKIND/$HCVER
113-
HC=$("$HOME/.ghcup/bin/ghcup" whereis ghc "$HCVER")
114-
HCPKG=$(echo "$HC" | sed 's#ghc$#ghc-pkg#')
115-
HADDOCK=$(echo "$HC" | sed 's#ghc$#haddock#')
116-
echo "HC=$HC" >> "$GITHUB_ENV"
117-
echo "HCPKG=$HCPKG" >> "$GITHUB_ENV"
118-
echo "HADDOCK=$HADDOCK" >> "$GITHUB_ENV"
119-
echo "CABAL=$HOME/.ghcup/bin/cabal-3.12.1.0 -vnormal+nowrap" >> "$GITHUB_ENV"
120131
HCNUMVER=$(${HC} --numeric-version|perl -ne '/^(\d+)\.(\d+)\.(\d+)(\.(\d+))?$/; print(10000 * $1 + 100 * $2 + ($3 == 0 ? $5 != 1 : $3))')
121132
echo "HCNUMVER=$HCNUMVER" >> "$GITHUB_ENV"
122133
echo "ARG_TESTS=--enable-tests" >> "$GITHUB_ENV"
123134
echo "ARG_BENCH=--enable-benchmarks" >> "$GITHUB_ENV"
124135
echo "HEADHACKAGE=false" >> "$GITHUB_ENV"
125136
echo "ARG_COMPILER=--$HCKIND --with-compiler=$HC" >> "$GITHUB_ENV"
126-
echo "GHCJSARITH=0" >> "$GITHUB_ENV"
127137
env:
128138
HCKIND: ${{ matrix.compilerKind }}
129139
HCNAME: ${{ matrix.compiler }}
@@ -266,8 +276,8 @@ jobs:
266276
$CABAL v2-test $ARG_COMPILER --enable-tests --enable-benchmarks --constraint='criterion +embed-data-files' all
267277
$CABAL v2-haddock --disable-documentation --haddock-all $ARG_COMPILER --with-haddock $HADDOCK --enable-tests --enable-benchmarks --constraint='criterion +embed-data-files' all
268278
- name: save cache
269-
uses: actions/cache/save@v4
270279
if: always()
280+
uses: actions/cache/save@v4
271281
with:
272282
key: ${{ runner.os }}-${{ matrix.compiler }}-${{ github.sha }}
273283
path: ~/.cabal/store

criterion-measurement/criterion-measurement.cabal

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,10 @@ tested-with:
2222
GHC==9.0.2,
2323
GHC==9.2.8,
2424
GHC==9.4.8,
25-
GHC==9.6.6,
26-
GHC==9.8.2,
27-
GHC==9.10.1
25+
GHC==9.6.7,
26+
GHC==9.8.4,
27+
GHC==9.10.2,
28+
GHC==9.12.2
2829

2930
flag fast
3031
description: compile without optimizations

criterion.cabal

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,10 @@ tested-with:
2727
GHC==9.0.2,
2828
GHC==9.2.8,
2929
GHC==9.4.8,
30-
GHC==9.6.6,
31-
GHC==9.8.2,
32-
GHC==9.10.1
30+
GHC==9.6.7,
31+
GHC==9.8.4,
32+
GHC==9.10.2,
33+
GHC==9.12.2
3334

3435
data-files:
3536
templates/*.css

examples/criterion-examples.cabal

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,10 @@ tested-with:
2020
GHC==9.0.2,
2121
GHC==9.2.8,
2222
GHC==9.4.8,
23-
GHC==9.6.6,
24-
GHC==9.8.2,
25-
GHC==9.10.1
23+
GHC==9.6.7,
24+
GHC==9.8.4,
25+
GHC==9.10.2,
26+
GHC==9.12.2
2627

2728
flag conduit-vs-pipes
2829
default: True

0 commit comments

Comments
 (0)