Skip to content

Commit 4791620

Browse files
committedMar 3, 2025·
Regenerate CI
1 parent 6c42187 commit 4791620

File tree

2 files changed

+29
-18
lines changed

2 files changed

+29
-18
lines changed
 

‎.github/workflows/haskell-ci.yml

+27-17
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.20250216
1212
#
13-
# REGENDATA ("0.19.20240708",["github","cabal.project"])
13+
# REGENDATA ("0.19.20250216",["github","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,14 +28,19 @@ 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
4146
- compiler: ghc-9.6.6
@@ -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"
98105
curl -sL https://downloads.haskell.org/ghcup/0.1.30.0/x86_64-linux-ghcup-0.1.30.0 > "$HOME/.ghcup/bin/ghcup"
99106
chmod a+x "$HOME/.ghcup/bin/ghcup"
100-
"$HOME/.ghcup/bin/ghcup" install ghc "$HCVER" || (cat "$HOME"/.ghcup/logs/*.* && false)
107+
- name: Install cabal-install
108+
run: |
101109
"$HOME/.ghcup/bin/ghcup" install cabal 3.12.1.0 || (cat "$HOME"/.ghcup/logs/*.* && false)
110+
echo "CABAL=$HOME/.ghcup/bin/cabal-3.12.1.0 -vnormal+nowrap" >> "$GITHUB_ENV"
111+
- name: Install GHC (GHCup)
112+
if: matrix.setup-method == 'ghcup'
113+
run: |
114+
"$HOME/.ghcup/bin/ghcup" install ghc "$HCVER" || (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 }}
@@ -232,8 +242,8 @@ jobs:
232242
run: |
233243
$CABAL v2-haddock --disable-documentation --haddock-all $ARG_COMPILER --with-haddock $HADDOCK $ARG_TESTS $ARG_BENCH all
234244
- name: save cache
235-
uses: actions/cache/save@v4
236245
if: always()
246+
uses: actions/cache/save@v4
237247
with:
238248
key: ${{ runner.os }}-${{ matrix.compiler }}-${{ github.sha }}
239249
path: ~/.cabal/store

‎natural-transformation.cabal

+2-1
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,9 @@ tested-with: GHC == 8.0.2
2828
, GHC == 9.2.8
2929
, GHC == 9.4.8
3030
, GHC == 9.6.6
31-
, GHC == 9.8.2
31+
, GHC == 9.8.4
3232
, GHC == 9.10.1
33+
, GHC == 9.12.1
3334
cabal-version: >= 1.10
3435

3536
source-repository head

0 commit comments

Comments
 (0)
Please sign in to comment.