Skip to content

Commit 3244c4a

Browse files
committed
github-ci: regenerate
1 parent 07df105 commit 3244c4a

File tree

1 file changed

+22
-17
lines changed

1 file changed

+22
-17
lines changed

.github/workflows/haskell-ci.yml

Lines changed: 22 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,11 @@
66
#
77
# haskell-ci regenerate
88
#
9-
# For more information, see https://github.com/andreasabel/haskell-ci
9+
# For more information, see https://github.com/haskell-CI/haskell-ci
1010
#
11-
# version: 0.19.20240703
11+
# version: 0.19.20250330
1212
#
13-
# REGENDATA ("0.19.20240703",["github","cabal.project"])
13+
# REGENDATA ("0.19.20250330",["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:
@@ -90,15 +90,29 @@ jobs:
9090
allow-failure: false
9191
fail-fast: false
9292
steps:
93-
- name: apt
93+
- name: apt-get install
9494
run: |
9595
apt-get update
9696
apt-get install -y --no-install-recommends gnupg ca-certificates dirmngr curl git software-properties-common libtinfo5 libnuma-dev
97+
- name: Install GHCup
98+
run: |
9799
mkdir -p "$HOME/.ghcup/bin"
98-
curl -sL https://downloads.haskell.org/ghcup/0.1.20.0/x86_64-linux-ghcup-0.1.20.0 > "$HOME/.ghcup/bin/ghcup"
100+
curl -sL https://downloads.haskell.org/ghcup/0.1.50.1/x86_64-linux-ghcup-0.1.50.1 > "$HOME/.ghcup/bin/ghcup"
99101
chmod a+x "$HOME/.ghcup/bin/ghcup"
102+
- name: Install cabal-install
103+
run: |
104+
"$HOME/.ghcup/bin/ghcup" install cabal 3.14.1.1-p1 || (cat "$HOME"/.ghcup/logs/*.* && false)
105+
echo "CABAL=$HOME/.ghcup/bin/cabal-3.14.1.1-p1 -vnormal+nowrap" >> "$GITHUB_ENV"
106+
- name: Install GHC (GHCup)
107+
if: matrix.setup-method == 'ghcup'
108+
run: |
100109
"$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)
110+
HC=$("$HOME/.ghcup/bin/ghcup" whereis ghc "$HCVER")
111+
HCPKG=$(echo "$HC" | sed 's#ghc$#ghc-pkg#')
112+
HADDOCK=$(echo "$HC" | sed 's#ghc$#haddock#')
113+
echo "HC=$HC" >> "$GITHUB_ENV"
114+
echo "HCPKG=$HCPKG" >> "$GITHUB_ENV"
115+
echo "HADDOCK=$HADDOCK" >> "$GITHUB_ENV"
102116
env:
103117
HCKIND: ${{ matrix.compilerKind }}
104118
HCNAME: ${{ matrix.compiler }}
@@ -109,21 +123,12 @@ jobs:
109123
echo "LANG=C.UTF-8" >> "$GITHUB_ENV"
110124
echo "CABAL_DIR=$HOME/.cabal" >> "$GITHUB_ENV"
111125
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"
120126
HCNUMVER=$(${HC} --numeric-version|perl -ne '/^(\d+)\.(\d+)\.(\d+)(\.(\d+))?$/; print(10000 * $1 + 100 * $2 + ($3 == 0 ? $5 != 1 : $3))')
121127
echo "HCNUMVER=$HCNUMVER" >> "$GITHUB_ENV"
122128
echo "ARG_TESTS=--enable-tests" >> "$GITHUB_ENV"
123129
echo "ARG_BENCH=--enable-benchmarks" >> "$GITHUB_ENV"
124130
echo "HEADHACKAGE=false" >> "$GITHUB_ENV"
125131
echo "ARG_COMPILER=--$HCKIND --with-compiler=$HC" >> "$GITHUB_ENV"
126-
echo "GHCJSARITH=0" >> "$GITHUB_ENV"
127132
env:
128133
HCKIND: ${{ matrix.compilerKind }}
129134
HCNAME: ${{ matrix.compiler }}
@@ -251,8 +256,8 @@ jobs:
251256
rm -f cabal.project.local
252257
$CABAL v2-build $ARG_COMPILER --disable-tests --disable-benchmarks all
253258
- name: save cache
254-
uses: actions/cache/save@v4
255259
if: always()
260+
uses: actions/cache/save@v4
256261
with:
257262
key: ${{ runner.os }}-${{ matrix.compiler }}-${{ github.sha }}
258263
path: ~/.cabal/store

0 commit comments

Comments
 (0)