Skip to content

Commit c95519c

Browse files
andreasabelBodigrim
authored andcommitted
Bump Haskell CI to GHCs 9.8.1 9.6.3 9.4.7
1 parent f984e9b commit c95519c

File tree

1 file changed

+10
-27
lines changed

1 file changed

+10
-27
lines changed

.github/workflows/haskell-ci.yml

Lines changed: 10 additions & 27 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.17.20230808
11+
# version: 0.17.20231010
1212
#
13-
# REGENDATA ("0.17.20230808",["github","zlib.cabal"])
13+
# REGENDATA ("0.17.20231010",["github","zlib.cabal"])
1414
#
1515
name: Haskell-CI
1616
on:
@@ -28,19 +28,19 @@ jobs:
2828
strategy:
2929
matrix:
3030
include:
31-
- compiler: ghc-9.8.1-alpha1
31+
- compiler: ghc-9.8.1
3232
compilerKind: ghc
33-
compilerVersion: 9.8.1-alpha1
33+
compilerVersion: 9.8.1
3434
setup-method: ghcup
35-
allow-failure: true
36-
- compiler: ghc-9.6.2
35+
allow-failure: false
36+
- compiler: ghc-9.6.3
3737
compilerKind: ghc
38-
compilerVersion: 9.6.2
38+
compilerVersion: 9.6.3
3939
setup-method: ghcup
4040
allow-failure: false
41-
- compiler: ghc-9.4.6
41+
- compiler: ghc-9.4.7
4242
compilerKind: ghc
43-
compilerVersion: 9.4.6
43+
compilerVersion: 9.4.7
4444
setup-method: ghcup
4545
allow-failure: false
4646
- compiler: ghc-9.2.8
@@ -123,7 +123,6 @@ jobs:
123123
mkdir -p "$HOME/.ghcup/bin"
124124
curl -sL https://downloads.haskell.org/ghcup/0.1.19.5/x86_64-linux-ghcup-0.1.19.5 > "$HOME/.ghcup/bin/ghcup"
125125
chmod a+x "$HOME/.ghcup/bin/ghcup"
126-
"$HOME/.ghcup/bin/ghcup" config add-release-channel https://raw.githubusercontent.com/haskell/ghcup-metadata/master/ghcup-prereleases-0.0.7.yaml;
127126
"$HOME/.ghcup/bin/ghcup" install ghc "$HCVER" || (cat "$HOME"/.ghcup/logs/*.* && false)
128127
"$HOME/.ghcup/bin/ghcup" install cabal 3.10.1.0 || (cat "$HOME"/.ghcup/logs/*.* && false)
129128
apt-get update
@@ -135,7 +134,6 @@ jobs:
135134
mkdir -p "$HOME/.ghcup/bin"
136135
curl -sL https://downloads.haskell.org/ghcup/0.1.19.5/x86_64-linux-ghcup-0.1.19.5 > "$HOME/.ghcup/bin/ghcup"
137136
chmod a+x "$HOME/.ghcup/bin/ghcup"
138-
"$HOME/.ghcup/bin/ghcup" config add-release-channel https://raw.githubusercontent.com/haskell/ghcup-metadata/master/ghcup-prereleases-0.0.7.yaml;
139137
"$HOME/.ghcup/bin/ghcup" install cabal 3.10.1.0 || (cat "$HOME"/.ghcup/logs/*.* && false)
140138
fi
141139
env:
@@ -169,7 +167,7 @@ jobs:
169167
echo "HCNUMVER=$HCNUMVER" >> "$GITHUB_ENV"
170168
if [ $((HCNUMVER >= 70400)) -ne 0 ] ; then echo "ARG_TESTS=--enable-tests" >> "$GITHUB_ENV" ; else echo "ARG_TESTS=--disable-tests" >> "$GITHUB_ENV" ; fi
171169
echo "ARG_BENCH=--enable-benchmarks" >> "$GITHUB_ENV"
172-
if [ $((HCNUMVER >= 90800)) -ne 0 ] ; then echo "HEADHACKAGE=true" >> "$GITHUB_ENV" ; else echo "HEADHACKAGE=false" >> "$GITHUB_ENV" ; fi
170+
echo "HEADHACKAGE=false" >> "$GITHUB_ENV"
173171
echo "ARG_COMPILER=--$HCKIND --with-compiler=$HC" >> "$GITHUB_ENV"
174172
echo "GHCJSARITH=0" >> "$GITHUB_ENV"
175173
env:
@@ -198,18 +196,6 @@ jobs:
198196
repository hackage.haskell.org
199197
url: http://hackage.haskell.org/
200198
EOF
201-
if $HEADHACKAGE; then
202-
cat >> $CABAL_CONFIG <<EOF
203-
repository head.hackage.ghc.haskell.org
204-
url: https://ghc.gitlab.haskell.org/head.hackage/
205-
secure: True
206-
root-keys: 7541f32a4ccca4f97aea3b22f5e593ba2c0267546016b992dfadcd2fe944e55d
207-
26021a13b401500c8eb2761ca95c61f2d625bfef951b939a8124ed12ecf07329
208-
f76d08be13e9a61a377a85e2fb63f4c5435d40f8feb3e12eb05905edb8cdea89
209-
key-threshold: 3
210-
active-repositories: hackage.haskell.org, head.hackage.ghc.haskell.org:override
211-
EOF
212-
fi
213199
cat >> $CABAL_CONFIG <<EOF
214200
program-default-options
215201
ghc-options: $GHCJOBS +RTS -M3G -RTS
@@ -261,9 +247,6 @@ jobs:
261247
if [ $((HCNUMVER >= 80200)) -ne 0 ] ; then echo " ghc-options: -Werror=missing-methods" >> cabal.project ; fi
262248
cat >> cabal.project <<EOF
263249
EOF
264-
if $HEADHACKAGE; then
265-
echo "allow-newer: $($HCPKG list --simple-output | sed -E 's/([a-zA-Z-]+)-[0-9.]+/*:\1,/g')" >> cabal.project
266-
fi
267250
$HCPKG list --simple-output --names-only | perl -ne 'for (split /\s+/) { print "constraints: $_ installed\n" unless /^(zlib)$/; }' >> cabal.project.local
268251
cat cabal.project
269252
cat cabal.project.local

0 commit comments

Comments
 (0)