Skip to content

Commit dcf5db4

Browse files
committed
Haskell-CI: bump to GHC 9.6.1 and 9.2.7
1 parent dbaf9a0 commit dcf5db4

File tree

3 files changed

+13
-28
lines changed

3 files changed

+13
-28
lines changed

.github/workflows/haskell-ci.yml

Lines changed: 11 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.15.20230217
11+
# version: 0.15.20230321
1212
#
13-
# REGENDATA ("0.15.20230217",["github","hackage-server.cabal"])
13+
# REGENDATA ("0.15.20230321",["github","hackage-server.cabal"])
1414
#
1515
name: Haskell-CI
1616
on:
@@ -34,19 +34,19 @@ jobs:
3434
strategy:
3535
matrix:
3636
include:
37-
- compiler: ghc-9.6.0.20230210
37+
- compiler: ghc-9.6.1
3838
compilerKind: ghc
39-
compilerVersion: 9.6.0.20230210
39+
compilerVersion: 9.6.1
4040
setup-method: ghcup
41-
allow-failure: true
41+
allow-failure: false
4242
- compiler: ghc-9.4.4
4343
compilerKind: ghc
4444
compilerVersion: 9.4.4
4545
setup-method: ghcup
4646
allow-failure: false
47-
- compiler: ghc-9.2.6
47+
- compiler: ghc-9.2.7
4848
compilerKind: ghc
49-
compilerVersion: 9.2.6
49+
compilerVersion: 9.2.7
5050
setup-method: ghcup
5151
allow-failure: false
5252
- compiler: ghc-9.0.2
@@ -71,11 +71,10 @@ jobs:
7171
apt-get update
7272
apt-get install -y --no-install-recommends gnupg ca-certificates dirmngr curl git software-properties-common libtinfo5
7373
mkdir -p "$HOME/.ghcup/bin"
74-
curl -sL https://downloads.haskell.org/ghcup/0.1.18.0/x86_64-linux-ghcup-0.1.18.0 > "$HOME/.ghcup/bin/ghcup"
74+
curl -sL https://downloads.haskell.org/ghcup/0.1.19.2/x86_64-linux-ghcup-0.1.19.2 > "$HOME/.ghcup/bin/ghcup"
7575
chmod a+x "$HOME/.ghcup/bin/ghcup"
76-
"$HOME/.ghcup/bin/ghcup" config add-release-channel https://github.com/raw/haskell/ghcup-metadata/master/ghcup-prereleases-0.0.7.yaml;
7776
"$HOME/.ghcup/bin/ghcup" install ghc "$HCVER" || (cat "$HOME"/.ghcup/logs/*.* && false)
78-
"$HOME/.ghcup/bin/ghcup" install cabal 3.9.0.0 || (cat "$HOME"/.ghcup/logs/*.* && false)
77+
"$HOME/.ghcup/bin/ghcup" install cabal 3.10.1.0 || (cat "$HOME"/.ghcup/logs/*.* && false)
7978
apt-get update
8079
apt-get install -y libbrotli-dev libgd-dev
8180
env:
@@ -93,12 +92,12 @@ jobs:
9392
echo "HC=$HC" >> "$GITHUB_ENV"
9493
echo "HCPKG=$HOME/.ghcup/bin/$HCKIND-pkg-$HCVER" >> "$GITHUB_ENV"
9594
echo "HADDOCK=$HOME/.ghcup/bin/haddock-$HCVER" >> "$GITHUB_ENV"
96-
echo "CABAL=$HOME/.ghcup/bin/cabal-3.9.0.0 -vnormal+nowrap" >> "$GITHUB_ENV"
95+
echo "CABAL=$HOME/.ghcup/bin/cabal-3.10.1.0 -vnormal+nowrap" >> "$GITHUB_ENV"
9796
HCNUMVER=$(${HC} --numeric-version|perl -ne '/^(\d+)\.(\d+)\.(\d+)(\.(\d+))?$/; print(10000 * $1 + 100 * $2 + ($3 == 0 ? $5 != 1 : $3))')
9897
echo "HCNUMVER=$HCNUMVER" >> "$GITHUB_ENV"
9998
echo "ARG_TESTS=--enable-tests" >> "$GITHUB_ENV"
10099
echo "ARG_BENCH=--enable-benchmarks" >> "$GITHUB_ENV"
101-
if [ $((HCNUMVER >= 90600)) -ne 0 ] ; then echo "HEADHACKAGE=true" >> "$GITHUB_ENV" ; else echo "HEADHACKAGE=false" >> "$GITHUB_ENV" ; fi
100+
echo "HEADHACKAGE=false" >> "$GITHUB_ENV"
102101
echo "ARG_COMPILER=--$HCKIND --with-compiler=$HC" >> "$GITHUB_ENV"
103102
echo "GHCJSARITH=0" >> "$GITHUB_ENV"
104103
env:
@@ -127,18 +126,6 @@ jobs:
127126
repository hackage.haskell.org
128127
url: http://hackage.haskell.org/
129128
EOF
130-
if $HEADHACKAGE; then
131-
cat >> $CABAL_CONFIG <<EOF
132-
repository head.hackage.ghc.haskell.org
133-
url: https://ghc.gitlab.haskell.org/head.hackage/
134-
secure: True
135-
root-keys: 7541f32a4ccca4f97aea3b22f5e593ba2c0267546016b992dfadcd2fe944e55d
136-
26021a13b401500c8eb2761ca95c61f2d625bfef951b939a8124ed12ecf07329
137-
f76d08be13e9a61a377a85e2fb63f4c5435d40f8feb3e12eb05905edb8cdea89
138-
key-threshold: 3
139-
active-repositories: hackage.haskell.org, head.hackage.ghc.haskell.org:override
140-
EOF
141-
fi
142129
cat >> $CABAL_CONFIG <<EOF
143130
program-default-options
144131
ghc-options: $GHCJOBS +RTS -M3G -RTS
@@ -190,9 +177,6 @@ jobs:
190177
echo " ghc-options: -Werror=missing-methods" >> cabal.project
191178
cat >> cabal.project <<EOF
192179
EOF
193-
if $HEADHACKAGE; then
194-
echo "allow-newer: $($HCPKG list --simple-output | sed -E 's/([a-zA-Z-]+)-[0-9.]+/*:\1,/g')" >> cabal.project
195-
fi
196180
$HCPKG list --simple-output --names-only | perl -ne 'for (split /\s+/) { print "constraints: $_ installed\n" unless /^(Cabal|hackage-server|parsec|process|text)$/; }' >> cabal.project.local
197181
cat cabal.project
198182
cat cabal.project.local

cabal.haskell-ci

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ installed: +all -Cabal -text -parsec -process
1010
distribution: jammy
1111

1212
apt: libbrotli-dev libgd-dev
13+
-- libgd-dev is for gd via hs-captcha
1314

1415
-- Make sure the haddock step is included,
1516
-- even though we don't define any library.

hackage-server.cabal

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ copyright: 2008-2015 Duncan Coutts,
2727
license: BSD-3-Clause
2828
license-file: LICENSE
2929

30-
tested-with: GHC == { 9.6.0, 9.4.4, 9.2.6, 9.0.2, 8.10.7, 8.8.4 }
30+
tested-with: GHC == { 9.6.1, 9.4.4, 9.2.7, 9.0.2, 8.10.7, 8.8.4 }
3131

3232
data-dir: datafiles
3333
data-files:

0 commit comments

Comments
 (0)