Skip to content

Commit ecc94f0

Browse files
committed
github-ci: Regenerate
Moves to Ubuntu 24.04, fixing broken jobs.
1 parent 2b8e5f6 commit ecc94f0

File tree

1 file changed

+23
-19
lines changed

1 file changed

+23
-19
lines changed

.github/workflows/haskell-ci.yml

Lines changed: 23 additions & 19 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.20240630
11+
# version: 0.19.20250330
1212
#
13-
# REGENDATA ("0.19.20240630",["github","hackage-server.cabal"])
13+
# REGENDATA ("0.19.20250330",["github","hackage-server.cabal"])
1414
#
1515
name: Haskell-CI
1616
on:
@@ -23,7 +23,7 @@ on:
2323
jobs:
2424
linux:
2525
name: Haskell-CI - Linux - ${{ matrix.compiler }}
26-
runs-on: ubuntu-20.04
26+
runs-on: ubuntu-24.04
2727
timeout-minutes:
2828
60
2929
container:
@@ -74,17 +74,30 @@ jobs:
7474
allow-failure: false
7575
fail-fast: false
7676
steps:
77-
- name: apt
77+
- name: apt-get install
7878
run: |
7979
apt-get update
8080
apt-get install -y --no-install-recommends gnupg ca-certificates dirmngr curl git software-properties-common libtinfo5
81+
apt-get install -y libbrotli-dev libgd-dev
82+
- name: Install GHCup
83+
run: |
8184
mkdir -p "$HOME/.ghcup/bin"
82-
curl -sL https://downloads.haskell.org/ghcup/0.1.20.0/x86_64-linux-ghcup-0.1.20.0 > "$HOME/.ghcup/bin/ghcup"
85+
curl -sL https://downloads.haskell.org/ghcup/0.1.50.1/x86_64-linux-ghcup-0.1.50.1 > "$HOME/.ghcup/bin/ghcup"
8386
chmod a+x "$HOME/.ghcup/bin/ghcup"
87+
- name: Install cabal-install
88+
run: |
89+
"$HOME/.ghcup/bin/ghcup" install cabal 3.14.1.1-p1 || (cat "$HOME"/.ghcup/logs/*.* && false)
90+
echo "CABAL=$HOME/.ghcup/bin/cabal-3.14.1.1-p1 -vnormal+nowrap" >> "$GITHUB_ENV"
91+
- name: Install GHC (GHCup)
92+
if: matrix.setup-method == 'ghcup'
93+
run: |
8494
"$HOME/.ghcup/bin/ghcup" install ghc "$HCVER" || (cat "$HOME"/.ghcup/logs/*.* && false)
85-
"$HOME/.ghcup/bin/ghcup" install cabal 3.12.1.0 || (cat "$HOME"/.ghcup/logs/*.* && false)
86-
apt-get update
87-
apt-get install -y libbrotli-dev libgd-dev
95+
HC=$("$HOME/.ghcup/bin/ghcup" whereis ghc "$HCVER")
96+
HCPKG=$(echo "$HC" | sed 's#ghc$#ghc-pkg#')
97+
HADDOCK=$(echo "$HC" | sed 's#ghc$#haddock#')
98+
echo "HC=$HC" >> "$GITHUB_ENV"
99+
echo "HCPKG=$HCPKG" >> "$GITHUB_ENV"
100+
echo "HADDOCK=$HADDOCK" >> "$GITHUB_ENV"
88101
env:
89102
HCKIND: ${{ matrix.compilerKind }}
90103
HCNAME: ${{ matrix.compiler }}
@@ -95,21 +108,12 @@ jobs:
95108
echo "LANG=C.UTF-8" >> "$GITHUB_ENV"
96109
echo "CABAL_DIR=$HOME/.cabal" >> "$GITHUB_ENV"
97110
echo "CABAL_CONFIG=$HOME/.cabal/config" >> "$GITHUB_ENV"
98-
HCDIR=/opt/$HCKIND/$HCVER
99-
HC=$("$HOME/.ghcup/bin/ghcup" whereis ghc "$HCVER")
100-
HCPKG=$(echo "$HC" | sed 's#ghc$#ghc-pkg#')
101-
HADDOCK=$(echo "$HC" | sed 's#ghc$#haddock#')
102-
echo "HC=$HC" >> "$GITHUB_ENV"
103-
echo "HCPKG=$HCPKG" >> "$GITHUB_ENV"
104-
echo "HADDOCK=$HADDOCK" >> "$GITHUB_ENV"
105-
echo "CABAL=$HOME/.ghcup/bin/cabal-3.12.1.0 -vnormal+nowrap" >> "$GITHUB_ENV"
106111
HCNUMVER=$(${HC} --numeric-version|perl -ne '/^(\d+)\.(\d+)\.(\d+)(\.(\d+))?$/; print(10000 * $1 + 100 * $2 + ($3 == 0 ? $5 != 1 : $3))')
107112
echo "HCNUMVER=$HCNUMVER" >> "$GITHUB_ENV"
108113
echo "ARG_TESTS=--enable-tests" >> "$GITHUB_ENV"
109114
echo "ARG_BENCH=--enable-benchmarks" >> "$GITHUB_ENV"
110115
echo "HEADHACKAGE=false" >> "$GITHUB_ENV"
111116
echo "ARG_COMPILER=--$HCKIND --with-compiler=$HC" >> "$GITHUB_ENV"
112-
echo "GHCJSARITH=0" >> "$GITHUB_ENV"
113117
env:
114118
HCKIND: ${{ matrix.compilerKind }}
115119
HCNAME: ${{ matrix.compiler }}
@@ -225,8 +229,8 @@ jobs:
225229
rm -f cabal.project.local
226230
$CABAL v2-build $ARG_COMPILER --disable-tests --disable-benchmarks all
227231
- name: save cache
228-
uses: actions/cache/save@v4
229232
if: always()
233+
uses: actions/cache/save@v4
230234
with:
231235
key: ${{ runner.os }}-${{ matrix.compiler }}-${{ github.sha }}
232236
path: ~/.cabal/store

0 commit comments

Comments
 (0)