Skip to content

Commit 7317b8a

Browse files
andreasabelBodigrim
authored andcommitted
Bump CI to ubuntu-20.04 and GHC 9.2.7
ubuntu-18.04 has reach EOL.
1 parent ecc09e4 commit 7317b8a

File tree

2 files changed

+16
-32
lines changed

2 files changed

+16
-32
lines changed

.github/workflows/haskell-ci.yml

Lines changed: 15 additions & 31 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.15.20230127
11+
# version: 0.15.20230321
1212
#
13-
# REGENDATA ("0.15.20230127",["github","zlib.cabal"])
13+
# REGENDATA ("0.15.20230321",["github","zlib.cabal"])
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-18.04
22+
runs-on: ubuntu-20.04
2323
timeout-minutes:
2424
60
2525
container:
@@ -28,19 +28,19 @@ jobs:
2828
strategy:
2929
matrix:
3030
include:
31-
- compiler: ghc-9.6.0.20230111
31+
- compiler: ghc-9.6.1
3232
compilerKind: ghc
33-
compilerVersion: 9.6.0.20230111
33+
compilerVersion: 9.6.1
3434
setup-method: ghcup
35-
allow-failure: true
35+
allow-failure: false
3636
- compiler: ghc-9.4.4
3737
compilerKind: ghc
3838
compilerVersion: 9.4.4
3939
setup-method: ghcup
4040
allow-failure: false
41-
- compiler: ghc-9.2.5
41+
- compiler: ghc-9.2.7
4242
compilerKind: ghc
43-
compilerVersion: 9.2.5
43+
compilerVersion: 9.2.7
4444
setup-method: ghcup
4545
allow-failure: false
4646
- compiler: ghc-9.0.2
@@ -116,21 +116,20 @@ jobs:
116116
apt-get install -y --no-install-recommends gnupg ca-certificates dirmngr curl git software-properties-common libtinfo5
117117
if [ "${{ matrix.setup-method }}" = ghcup ]; then
118118
mkdir -p "$HOME/.ghcup/bin"
119-
curl -sL https://downloads.haskell.org/ghcup/0.1.19.0/x86_64-linux-ghcup-0.1.19.0 > "$HOME/.ghcup/bin/ghcup"
119+
curl -sL https://downloads.haskell.org/ghcup/0.1.19.2/x86_64-linux-ghcup-0.1.19.2 > "$HOME/.ghcup/bin/ghcup"
120120
chmod a+x "$HOME/.ghcup/bin/ghcup"
121-
"$HOME/.ghcup/bin/ghcup" config add-release-channel https://raw.githubusercontent.com/haskell/ghcup-metadata/master/ghcup-prereleases-0.0.7.yaml;
122121
"$HOME/.ghcup/bin/ghcup" install ghc "$HCVER" || (cat "$HOME"/.ghcup/logs/*.* && false)
123-
"$HOME/.ghcup/bin/ghcup" install cabal 3.6.2.0 || (cat "$HOME"/.ghcup/logs/*.* && false)
122+
"$HOME/.ghcup/bin/ghcup" install cabal 3.10.1.0 || (cat "$HOME"/.ghcup/logs/*.* && false)
124123
apt-get update
125124
apt-get install -y zlib1g-dev
126125
else
127126
apt-add-repository -y 'ppa:hvr/ghc'
128127
apt-get update
129128
apt-get install -y "$HCNAME" zlib1g-dev
130129
mkdir -p "$HOME/.ghcup/bin"
131-
curl -sL https://downloads.haskell.org/ghcup/0.1.19.0/x86_64-linux-ghcup-0.1.19.0 > "$HOME/.ghcup/bin/ghcup"
130+
curl -sL https://downloads.haskell.org/ghcup/0.1.19.2/x86_64-linux-ghcup-0.1.19.2 > "$HOME/.ghcup/bin/ghcup"
132131
chmod a+x "$HOME/.ghcup/bin/ghcup"
133-
"$HOME/.ghcup/bin/ghcup" install cabal 3.6.2.0 || (cat "$HOME"/.ghcup/logs/*.* && false)
132+
"$HOME/.ghcup/bin/ghcup" install cabal 3.10.1.0 || (cat "$HOME"/.ghcup/logs/*.* && false)
134133
fi
135134
env:
136135
HCKIND: ${{ matrix.compilerKind }}
@@ -148,20 +147,20 @@ jobs:
148147
echo "HC=$HC" >> "$GITHUB_ENV"
149148
echo "HCPKG=$HOME/.ghcup/bin/$HCKIND-pkg-$HCVER" >> "$GITHUB_ENV"
150149
echo "HADDOCK=$HOME/.ghcup/bin/haddock-$HCVER" >> "$GITHUB_ENV"
151-
echo "CABAL=$HOME/.ghcup/bin/cabal-3.6.2.0 -vnormal+nowrap" >> "$GITHUB_ENV"
150+
echo "CABAL=$HOME/.ghcup/bin/cabal-3.10.1.0 -vnormal+nowrap" >> "$GITHUB_ENV"
152151
else
153152
HC=$HCDIR/bin/$HCKIND
154153
echo "HC=$HC" >> "$GITHUB_ENV"
155154
echo "HCPKG=$HCDIR/bin/$HCKIND-pkg" >> "$GITHUB_ENV"
156155
echo "HADDOCK=$HCDIR/bin/haddock" >> "$GITHUB_ENV"
157-
echo "CABAL=$HOME/.ghcup/bin/cabal-3.6.2.0 -vnormal+nowrap" >> "$GITHUB_ENV"
156+
echo "CABAL=$HOME/.ghcup/bin/cabal-3.10.1.0 -vnormal+nowrap" >> "$GITHUB_ENV"
158157
fi
159158
160159
HCNUMVER=$(${HC} --numeric-version|perl -ne '/^(\d+)\.(\d+)\.(\d+)(\.(\d+))?$/; print(10000 * $1 + 100 * $2 + ($3 == 0 ? $5 != 1 : $3))')
161160
echo "HCNUMVER=$HCNUMVER" >> "$GITHUB_ENV"
162161
if [ $((HCNUMVER >= 70400)) -ne 0 ] ; then echo "ARG_TESTS=--enable-tests" >> "$GITHUB_ENV" ; else echo "ARG_TESTS=--disable-tests" >> "$GITHUB_ENV" ; fi
163162
echo "ARG_BENCH=--enable-benchmarks" >> "$GITHUB_ENV"
164-
if [ $((HCNUMVER >= 90600)) -ne 0 ] ; then echo "HEADHACKAGE=true" >> "$GITHUB_ENV" ; else echo "HEADHACKAGE=false" >> "$GITHUB_ENV" ; fi
163+
echo "HEADHACKAGE=false" >> "$GITHUB_ENV"
165164
echo "ARG_COMPILER=--$HCKIND --with-compiler=$HC" >> "$GITHUB_ENV"
166165
echo "GHCJSARITH=0" >> "$GITHUB_ENV"
167166
env:
@@ -190,18 +189,6 @@ jobs:
190189
repository hackage.haskell.org
191190
url: http://hackage.haskell.org/
192191
EOF
193-
if $HEADHACKAGE; then
194-
cat >> $CABAL_CONFIG <<EOF
195-
repository head.hackage.ghc.haskell.org
196-
url: https://ghc.gitlab.haskell.org/head.hackage/
197-
secure: True
198-
root-keys: 7541f32a4ccca4f97aea3b22f5e593ba2c0267546016b992dfadcd2fe944e55d
199-
26021a13b401500c8eb2761ca95c61f2d625bfef951b939a8124ed12ecf07329
200-
f76d08be13e9a61a377a85e2fb63f4c5435d40f8feb3e12eb05905edb8cdea89
201-
key-threshold: 3
202-
active-repositories: hackage.haskell.org, head.hackage.ghc.haskell.org:override
203-
EOF
204-
fi
205192
cat >> $CABAL_CONFIG <<EOF
206193
program-default-options
207194
ghc-options: $GHCJOBS +RTS -M3G -RTS
@@ -253,9 +240,6 @@ jobs:
253240
if [ $((HCNUMVER >= 80200)) -ne 0 ] ; then echo " ghc-options: -Werror=missing-methods" >> cabal.project ; fi
254241
cat >> cabal.project <<EOF
255242
EOF
256-
if $HEADHACKAGE; then
257-
echo "allow-newer: $($HCPKG list --simple-output | sed -E 's/([a-zA-Z-]+)-[0-9.]+/*:\1,/g')" >> cabal.project
258-
fi
259243
$HCPKG list --simple-output --names-only | perl -ne 'for (split /\s+/) { print "constraints: $_ installed\n" unless /^(zlib)$/; }' >> cabal.project.local
260244
cat cabal.project
261245
cat cabal.project.local

zlib.cabal

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ tested-with: GHC == 7.0.4
3535
, GHC == 8.8.4
3636
, GHC == 8.10.7
3737
, GHC == 9.0.2
38-
, GHC == 9.2.5
38+
, GHC == 9.2.7
3939
, GHC == 9.4.4
4040
, GHC == 9.6.1
4141

0 commit comments

Comments
 (0)