Skip to content

Commit 5a853a3

Browse files
andreasabelandreasabel
committed
Bump CI to GHC 9.10.0 alpha3, GHC 9.8.2, GHC 9.6.5
1 parent 0fb0080 commit 5a853a3

File tree

2 files changed

+57
-60
lines changed

2 files changed

+57
-60
lines changed

‎.github/workflows/haskell-ci.yml‎

Lines changed: 51 additions & 56 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@
88
#
99
# For more information, see https://github.com/andreasabel/haskell-ci
1010
#
11-
# version: 0.17.20231010
11+
# version: 0.19.20240422
1212
#
13-
# REGENDATA ("0.17.20231010",["github","attoparsec.cabal","--benchmarks-jobs",">=7.8"])
13+
# REGENDATA ("0.19.20240422",["github","attoparsec.cabal","--benchmarks-jobs",">=7.8"])
1414
#
1515
name: Haskell-CI
1616
on:
@@ -27,24 +27,29 @@ jobs:
2727
timeout-minutes:
2828
60
2929
container:
30-
image: buildpack-deps:focal
30+
image: buildpack-deps:jammy
3131
continue-on-error: ${{ matrix.allow-failure }}
3232
strategy:
3333
matrix:
3434
include:
35-
- compiler: ghc-9.8.1
35+
- compiler: ghc-9.10.0.20240413
3636
compilerKind: ghc
37-
compilerVersion: 9.8.1
37+
compilerVersion: 9.10.0.20240413
3838
setup-method: ghcup
3939
allow-failure: false
40-
- compiler: ghc-9.6.3
40+
- compiler: ghc-9.8.2
4141
compilerKind: ghc
42-
compilerVersion: 9.6.3
42+
compilerVersion: 9.8.2
4343
setup-method: ghcup
4444
allow-failure: false
45-
- compiler: ghc-9.4.7
45+
- compiler: ghc-9.6.5
4646
compilerKind: ghc
47-
compilerVersion: 9.4.7
47+
compilerVersion: 9.6.5
48+
setup-method: ghcup
49+
allow-failure: false
50+
- compiler: ghc-9.4.8
51+
compilerKind: ghc
52+
compilerVersion: 9.4.8
4853
setup-method: ghcup
4954
allow-failure: false
5055
- compiler: ghc-9.2.8
@@ -65,56 +70,40 @@ jobs:
6570
- compiler: ghc-8.8.4
6671
compilerKind: ghc
6772
compilerVersion: 8.8.4
68-
setup-method: hvr-ppa
73+
setup-method: ghcup
6974
allow-failure: false
7075
- compiler: ghc-8.6.5
7176
compilerKind: ghc
7277
compilerVersion: 8.6.5
73-
setup-method: hvr-ppa
78+
setup-method: ghcup
7479
allow-failure: false
7580
- compiler: ghc-8.4.4
7681
compilerKind: ghc
7782
compilerVersion: 8.4.4
78-
setup-method: hvr-ppa
83+
setup-method: ghcup
7984
allow-failure: false
8085
- compiler: ghc-8.2.2
8186
compilerKind: ghc
8287
compilerVersion: 8.2.2
83-
setup-method: hvr-ppa
88+
setup-method: ghcup
8489
allow-failure: false
8590
- compiler: ghc-8.0.2
8691
compilerKind: ghc
8792
compilerVersion: 8.0.2
88-
setup-method: hvr-ppa
89-
allow-failure: false
90-
- compiler: ghc-7.10.3
91-
compilerKind: ghc
92-
compilerVersion: 7.10.3
93-
setup-method: hvr-ppa
93+
setup-method: ghcup
9494
allow-failure: false
9595
fail-fast: false
9696
steps:
9797
- name: apt
9898
run: |
9999
apt-get update
100-
apt-get install -y --no-install-recommends gnupg ca-certificates dirmngr curl git software-properties-common libtinfo5
101-
if [ "${{ matrix.setup-method }}" = ghcup ]; then
102-
mkdir -p "$HOME/.ghcup/bin"
103-
curl -sL https://downloads.haskell.org/ghcup/0.1.19.5/x86_64-linux-ghcup-0.1.19.5 > "$HOME/.ghcup/bin/ghcup"
104-
chmod a+x "$HOME/.ghcup/bin/ghcup"
105-
"$HOME/.ghcup/bin/ghcup" config add-release-channel https://raw.githubusercontent.com/haskell/ghcup-metadata/master/ghcup-prereleases-0.0.7.yaml;
106-
"$HOME/.ghcup/bin/ghcup" install ghc "$HCVER" || (cat "$HOME"/.ghcup/logs/*.* && false)
107-
"$HOME/.ghcup/bin/ghcup" install cabal 3.10.1.0 || (cat "$HOME"/.ghcup/logs/*.* && false)
108-
else
109-
apt-add-repository -y 'ppa:hvr/ghc'
110-
apt-get update
111-
apt-get install -y "$HCNAME"
112-
mkdir -p "$HOME/.ghcup/bin"
113-
curl -sL https://downloads.haskell.org/ghcup/0.1.19.5/x86_64-linux-ghcup-0.1.19.5 > "$HOME/.ghcup/bin/ghcup"
114-
chmod a+x "$HOME/.ghcup/bin/ghcup"
115-
"$HOME/.ghcup/bin/ghcup" config add-release-channel https://raw.githubusercontent.com/haskell/ghcup-metadata/master/ghcup-prereleases-0.0.7.yaml;
116-
"$HOME/.ghcup/bin/ghcup" install cabal 3.10.1.0 || (cat "$HOME"/.ghcup/logs/*.* && false)
117-
fi
100+
apt-get install -y --no-install-recommends gnupg ca-certificates dirmngr curl git software-properties-common libtinfo5 libnuma-dev
101+
mkdir -p "$HOME/.ghcup/bin"
102+
curl -sL https://downloads.haskell.org/ghcup/0.1.20.0/x86_64-linux-ghcup-0.1.20.0 > "$HOME/.ghcup/bin/ghcup"
103+
chmod a+x "$HOME/.ghcup/bin/ghcup"
104+
"$HOME/.ghcup/bin/ghcup" config add-release-channel https://raw.githubusercontent.com/haskell/ghcup-metadata/master/ghcup-prereleases-0.0.8.yaml;
105+
"$HOME/.ghcup/bin/ghcup" install ghc "$HCVER" || (cat "$HOME"/.ghcup/logs/*.* && false)
106+
"$HOME/.ghcup/bin/ghcup" install cabal 3.10.3.0 || (cat "$HOME"/.ghcup/logs/*.* && false)
118107
env:
119108
HCKIND: ${{ matrix.compilerKind }}
120109
HCNAME: ${{ matrix.compiler }}
@@ -126,27 +115,18 @@ jobs:
126115
echo "CABAL_DIR=$HOME/.cabal" >> "$GITHUB_ENV"
127116
echo "CABAL_CONFIG=$HOME/.cabal/config" >> "$GITHUB_ENV"
128117
HCDIR=/opt/$HCKIND/$HCVER
129-
if [ "${{ matrix.setup-method }}" = ghcup ]; then
130-
HC=$("$HOME/.ghcup/bin/ghcup" whereis ghc "$HCVER")
131-
HCPKG=$(echo "$HC" | sed 's#ghc$#ghc-pkg#')
132-
HADDOCK=$(echo "$HC" | sed 's#ghc$#haddock#')
133-
echo "HC=$HC" >> "$GITHUB_ENV"
134-
echo "HCPKG=$HCPKG" >> "$GITHUB_ENV"
135-
echo "HADDOCK=$HADDOCK" >> "$GITHUB_ENV"
136-
echo "CABAL=$HOME/.ghcup/bin/cabal-3.10.1.0 -vnormal+nowrap" >> "$GITHUB_ENV"
137-
else
138-
HC=$HCDIR/bin/$HCKIND
139-
echo "HC=$HC" >> "$GITHUB_ENV"
140-
echo "HCPKG=$HCDIR/bin/$HCKIND-pkg" >> "$GITHUB_ENV"
141-
echo "HADDOCK=$HCDIR/bin/haddock" >> "$GITHUB_ENV"
142-
echo "CABAL=$HOME/.ghcup/bin/cabal-3.10.1.0 -vnormal+nowrap" >> "$GITHUB_ENV"
143-
fi
144-
118+
HC=$("$HOME/.ghcup/bin/ghcup" whereis ghc "$HCVER")
119+
HCPKG=$(echo "$HC" | sed 's#ghc$#ghc-pkg#')
120+
HADDOCK=$(echo "$HC" | sed 's#ghc$#haddock#')
121+
echo "HC=$HC" >> "$GITHUB_ENV"
122+
echo "HCPKG=$HCPKG" >> "$GITHUB_ENV"
123+
echo "HADDOCK=$HADDOCK" >> "$GITHUB_ENV"
124+
echo "CABAL=$HOME/.ghcup/bin/cabal-3.10.3.0 -vnormal+nowrap" >> "$GITHUB_ENV"
145125
HCNUMVER=$(${HC} --numeric-version|perl -ne '/^(\d+)\.(\d+)\.(\d+)(\.(\d+))?$/; print(10000 * $1 + 100 * $2 + ($3 == 0 ? $5 != 1 : $3))')
146126
echo "HCNUMVER=$HCNUMVER" >> "$GITHUB_ENV"
147127
echo "ARG_TESTS=--enable-tests" >> "$GITHUB_ENV"
148128
echo "ARG_BENCH=--enable-benchmarks" >> "$GITHUB_ENV"
149-
echo "HEADHACKAGE=false" >> "$GITHUB_ENV"
129+
if [ $((HCNUMVER >= 91000)) -ne 0 ] ; then echo "HEADHACKAGE=true" >> "$GITHUB_ENV" ; else echo "HEADHACKAGE=false" >> "$GITHUB_ENV" ; fi
150130
echo "ARG_COMPILER=--$HCKIND --with-compiler=$HC" >> "$GITHUB_ENV"
151131
echo "GHCJSARITH=0" >> "$GITHUB_ENV"
152132
env:
@@ -175,6 +155,18 @@ jobs:
175155
repository hackage.haskell.org
176156
url: http://hackage.haskell.org/
177157
EOF
158+
if $HEADHACKAGE; then
159+
cat >> $CABAL_CONFIG <<EOF
160+
repository head.hackage.ghc.haskell.org
161+
url: https://ghc.gitlab.haskell.org/head.hackage/
162+
secure: True
163+
root-keys: 7541f32a4ccca4f97aea3b22f5e593ba2c0267546016b992dfadcd2fe944e55d
164+
26021a13b401500c8eb2761ca95c61f2d625bfef951b939a8124ed12ecf07329
165+
f76d08be13e9a61a377a85e2fb63f4c5435d40f8feb3e12eb05905edb8cdea89
166+
key-threshold: 3
167+
active-repositories: hackage.haskell.org, head.hackage.ghc.haskell.org:override
168+
EOF
169+
fi
178170
cat >> $CABAL_CONFIG <<EOF
179171
program-default-options
180172
ghc-options: $GHCJOBS +RTS -M3G -RTS
@@ -226,6 +218,9 @@ jobs:
226218
if [ $((HCNUMVER >= 80200)) -ne 0 ] ; then echo " ghc-options: -Werror=missing-methods" >> cabal.project ; fi
227219
cat >> cabal.project <<EOF
228220
EOF
221+
if $HEADHACKAGE; then
222+
echo "allow-newer: $($HCPKG list --simple-output | sed -E 's/([a-zA-Z-]+)-[0-9.]+/*:\1,/g')" >> cabal.project
223+
fi
229224
$HCPKG list --simple-output --names-only | perl -ne 'for (split /\s+/) { print "constraints: $_ installed\n" unless /^(attoparsec)$/; }' >> cabal.project.local
230225
cat cabal.project
231226
cat cabal.project.local
@@ -234,7 +229,7 @@ jobs:
234229
$CABAL v2-build $ARG_COMPILER $ARG_TESTS $ARG_BENCH --dry-run all
235230
cabal-plan
236231
- name: restore cache
237-
uses: actions/cache/restore@v3
232+
uses: actions/cache/restore@v4
238233
with:
239234
key: ${{ runner.os }}-${{ matrix.compiler }}-${{ github.sha }}
240235
path: ~/.cabal/store
@@ -264,7 +259,7 @@ jobs:
264259
rm -f cabal.project.local
265260
$CABAL v2-build $ARG_COMPILER --disable-tests --disable-benchmarks all
266261
- name: save cache
267-
uses: actions/cache/save@v3
262+
uses: actions/cache/save@v4
268263
if: always()
269264
with:
270265
key: ${{ runner.os }}-${{ matrix.compiler }}-${{ github.sha }}

‎attoparsec.cabal‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,10 @@ description:
1818
file formats.
1919

2020
tested-with:
21-
GHC == 9.8.1
22-
GHC == 9.6.3
23-
GHC == 9.4.7
21+
GHC == 9.10.0
22+
GHC == 9.8.2
23+
GHC == 9.6.5
24+
GHC == 9.4.8
2425
GHC == 9.2.8
2526
GHC == 9.0.2
2627
GHC == 8.10.7
@@ -29,7 +30,8 @@ tested-with:
2930
GHC == 8.4.4
3031
GHC == 8.2.2
3132
GHC == 8.0.2
32-
GHC == 7.10.3
33+
-- Older versions are not supported by ghcup on ubuntu-22.04
34+
-- GHC == 7.10.3
3335
-- GHC == 7.8.4
3436
-- GHC == 7.6.3
3537
-- GHC == 7.4.2

0 commit comments

Comments
 (0)