Skip to content

Commit 28c7423

Browse files
committed
Bump CI to 9.4.2
1 parent 5c89757 commit 28c7423

3 files changed

Lines changed: 14 additions & 30 deletions

File tree

.github/workflows/haskell-ci.yml

Lines changed: 10 additions & 26 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.20220710
11+
# version: 0.15.20221009
1212
#
13-
# REGENDATA ("0.15.20220710",["--config=cabal.haskell-ci","github","cabal.project"])
13+
# REGENDATA ("0.15.20221009",["--config=cabal.haskell-ci","github","cabal.project"])
1414
#
1515
name: Haskell-CI
1616
on:
@@ -34,14 +34,14 @@ jobs:
3434
strategy:
3535
matrix:
3636
include:
37-
- compiler: ghc-9.4.0.20220623
37+
- compiler: ghc-9.4.2
3838
compilerKind: ghc
39-
compilerVersion: 9.4.0.20220623
39+
compilerVersion: 9.4.2
4040
setup-method: ghcup
41-
allow-failure: true
42-
- compiler: ghc-9.2.3
41+
allow-failure: false
42+
- compiler: ghc-9.2.4
4343
compilerKind: ghc
44-
compilerVersion: 9.2.3
44+
compilerVersion: 9.2.4
4545
setup-method: ghcup
4646
allow-failure: false
4747
- compiler: ghc-9.0.2
@@ -97,17 +97,16 @@ jobs:
9797
apt-get install -y --no-install-recommends gnupg ca-certificates dirmngr curl git software-properties-common libtinfo5
9898
if [ "${{ matrix.setup-method }}" = ghcup ]; then
9999
mkdir -p "$HOME/.ghcup/bin"
100-
curl -sL https://downloads.haskell.org/ghcup/0.1.17.8/x86_64-linux-ghcup-0.1.17.8 > "$HOME/.ghcup/bin/ghcup"
100+
curl -sL https://downloads.haskell.org/ghcup/0.1.18.0/x86_64-linux-ghcup-0.1.18.0 > "$HOME/.ghcup/bin/ghcup"
101101
chmod a+x "$HOME/.ghcup/bin/ghcup"
102-
"$HOME/.ghcup/bin/ghcup" config add-release-channel https://raw.githubusercontent.com/haskell/ghcup-metadata/master/ghcup-prereleases-0.0.7.yaml;
103102
"$HOME/.ghcup/bin/ghcup" install ghc "$HCVER" || (cat "$HOME"/.ghcup/logs/*.* && false)
104103
"$HOME/.ghcup/bin/ghcup" install cabal 3.6.2.0 || (cat "$HOME"/.ghcup/logs/*.* && false)
105104
else
106105
apt-add-repository -y 'ppa:hvr/ghc'
107106
apt-get update
108107
apt-get install -y "$HCNAME"
109108
mkdir -p "$HOME/.ghcup/bin"
110-
curl -sL https://downloads.haskell.org/ghcup/0.1.17.8/x86_64-linux-ghcup-0.1.17.8 > "$HOME/.ghcup/bin/ghcup"
109+
curl -sL https://downloads.haskell.org/ghcup/0.1.18.0/x86_64-linux-ghcup-0.1.18.0 > "$HOME/.ghcup/bin/ghcup"
111110
chmod a+x "$HOME/.ghcup/bin/ghcup"
112111
"$HOME/.ghcup/bin/ghcup" install cabal 3.6.2.0 || (cat "$HOME"/.ghcup/logs/*.* && false)
113112
fi
@@ -140,7 +139,7 @@ jobs:
140139
echo "HCNUMVER=$HCNUMVER" >> "$GITHUB_ENV"
141140
echo "ARG_TESTS=--enable-tests" >> "$GITHUB_ENV"
142141
echo "ARG_BENCH=--enable-benchmarks" >> "$GITHUB_ENV"
143-
if [ $((HCNUMVER >= 90400)) -ne 0 ] ; then echo "HEADHACKAGE=true" >> "$GITHUB_ENV" ; else echo "HEADHACKAGE=false" >> "$GITHUB_ENV" ; fi
142+
echo "HEADHACKAGE=false" >> "$GITHUB_ENV"
144143
echo "ARG_COMPILER=--$HCKIND --with-compiler=$HC" >> "$GITHUB_ENV"
145144
echo "GHCJSARITH=0" >> "$GITHUB_ENV"
146145
env:
@@ -169,18 +168,6 @@ jobs:
169168
repository hackage.haskell.org
170169
url: http://hackage.haskell.org/
171170
EOF
172-
if $HEADHACKAGE; then
173-
cat >> $CABAL_CONFIG <<EOF
174-
repository head.hackage.ghc.haskell.org
175-
url: https://ghc.gitlab.haskell.org/head.hackage/
176-
secure: True
177-
root-keys: 7541f32a4ccca4f97aea3b22f5e593ba2c0267546016b992dfadcd2fe944e55d
178-
26021a13b401500c8eb2761ca95c61f2d625bfef951b939a8124ed12ecf07329
179-
f76d08be13e9a61a377a85e2fb63f4c5435d40f8feb3e12eb05905edb8cdea89
180-
key-threshold: 3
181-
active-repositories: hackage.haskell.org, head.hackage.ghc.haskell.org:override
182-
EOF
183-
fi
184171
cat >> $CABAL_CONFIG <<EOF
185172
program-default-options
186173
ghc-options: $GHCJOBS +RTS -M3G -RTS
@@ -241,9 +228,6 @@ jobs:
241228
constraints: github-samples +openssl
242229
optimization: False
243230
EOF
244-
if $HEADHACKAGE; then
245-
echo "allow-newer: $($HCPKG list --simple-output | sed -E 's/([a-zA-Z-]+)-[0-9.]+/*:\1,/g')" >> cabal.project
246-
fi
247231
$HCPKG list --simple-output --names-only | perl -ne 'for (split /\s+/) { print "constraints: $_ installed\n" unless /^(github|github-samples)$/; }' >> cabal.project.local
248232
cat cabal.project
249233
cat cabal.project.local

github.cabal

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,8 @@ copyright:
3030
Copyright 2012-2013 Mike Burns, Copyright 2013-2015 John Wiegley, Copyright 2016-2021 Oleg Grenrus
3131

3232
tested-with:
33-
GHC == 9.4.1
34-
GHC == 9.2.3
33+
GHC == 9.4.2
34+
GHC == 9.2.4
3535
GHC == 9.0.2
3636
GHC == 8.10.7
3737
GHC == 8.8.4

samples/github-samples.cabal

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@ description: Various samples of github package
1010
build-type: Simple
1111

1212
tested-with:
13-
GHC == 9.4.1
14-
GHC == 9.2.3
13+
GHC == 9.4.2
14+
GHC == 9.2.4
1515
GHC == 9.0.2
1616
GHC == 8.10.7
1717
GHC == 8.8.4

0 commit comments

Comments
 (0)