Skip to content

Commit e09bc46

Browse files
andreasabelandreasabel
committed
Bump CI to latest GHC minor versions 9.6.1, 9.4.5, 9.2.7
1 parent 693a7f8 commit e09bc46

File tree

3 files changed

+24
-42
lines changed

3 files changed

+24
-42
lines changed

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

Lines changed: 20 additions & 37 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.20230211
11+
# version: 0.16.1
1212
#
13-
# REGENDATA ("0.15.20230211",["github","regex-tdfa.cabal"])
13+
# REGENDATA ("0.16.1",["github","regex-tdfa.cabal"])
1414
#
1515
name: Haskell-CI
1616
on:
@@ -32,19 +32,19 @@ jobs:
3232
strategy:
3333
matrix:
3434
include:
35-
- compiler: ghc-9.6.0.20230128
35+
- compiler: ghc-9.6.1
3636
compilerKind: ghc
37-
compilerVersion: 9.6.0.20230128
37+
compilerVersion: 9.6.1
3838
setup-method: ghcup
39-
allow-failure: true
40-
- compiler: ghc-9.4.4
39+
allow-failure: false
40+
- compiler: ghc-9.4.5
4141
compilerKind: ghc
42-
compilerVersion: 9.4.4
42+
compilerVersion: 9.4.5
4343
setup-method: ghcup
4444
allow-failure: false
45-
- compiler: ghc-9.2.6
45+
- compiler: ghc-9.2.7
4646
compilerKind: ghc
47-
compilerVersion: 9.2.6
47+
compilerVersion: 9.2.7
4848
setup-method: ghcup
4949
allow-failure: false
5050
- compiler: ghc-9.0.2
@@ -110,20 +110,18 @@ jobs:
110110
apt-get install -y --no-install-recommends gnupg ca-certificates dirmngr curl git software-properties-common libtinfo5
111111
if [ "${{ matrix.setup-method }}" = ghcup ]; then
112112
mkdir -p "$HOME/.ghcup/bin"
113-
curl -sL https://downloads.haskell.org/ghcup/0.1.18.0/x86_64-linux-ghcup-0.1.18.0 > "$HOME/.ghcup/bin/ghcup"
113+
curl -sL https://downloads.haskell.org/ghcup/0.1.19.2/x86_64-linux-ghcup-0.1.19.2 > "$HOME/.ghcup/bin/ghcup"
114114
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;
116115
"$HOME/.ghcup/bin/ghcup" install ghc "$HCVER" || (cat "$HOME"/.ghcup/logs/*.* && false)
117-
"$HOME/.ghcup/bin/ghcup" install cabal 3.9.0.0 || (cat "$HOME"/.ghcup/logs/*.* && false)
116+
"$HOME/.ghcup/bin/ghcup" install cabal 3.10.1.0 || (cat "$HOME"/.ghcup/logs/*.* && false)
118117
else
119118
apt-add-repository -y 'ppa:hvr/ghc'
120119
apt-get update
121120
apt-get install -y "$HCNAME"
122121
mkdir -p "$HOME/.ghcup/bin"
123-
curl -sL https://downloads.haskell.org/ghcup/0.1.18.0/x86_64-linux-ghcup-0.1.18.0 > "$HOME/.ghcup/bin/ghcup"
122+
curl -sL https://downloads.haskell.org/ghcup/0.1.19.2/x86_64-linux-ghcup-0.1.19.2 > "$HOME/.ghcup/bin/ghcup"
124123
chmod a+x "$HOME/.ghcup/bin/ghcup"
125-
"$HOME/.ghcup/bin/ghcup" config add-release-channel https://raw.githubusercontent.com/haskell/ghcup-metadata/master/ghcup-prereleases-0.0.7.yaml;
126-
"$HOME/.ghcup/bin/ghcup" install cabal 3.9.0.0 || (cat "$HOME"/.ghcup/logs/*.* && false)
124+
"$HOME/.ghcup/bin/ghcup" install cabal 3.10.1.0 || (cat "$HOME"/.ghcup/logs/*.* && false)
127125
fi
128126
env:
129127
HCKIND: ${{ matrix.compilerKind }}
@@ -141,20 +139,20 @@ jobs:
141139
echo "HC=$HC" >> "$GITHUB_ENV"
142140
echo "HCPKG=$HOME/.ghcup/bin/$HCKIND-pkg-$HCVER" >> "$GITHUB_ENV"
143141
echo "HADDOCK=$HOME/.ghcup/bin/haddock-$HCVER" >> "$GITHUB_ENV"
144-
echo "CABAL=$HOME/.ghcup/bin/cabal-3.9.0.0 -vnormal+nowrap" >> "$GITHUB_ENV"
142+
echo "CABAL=$HOME/.ghcup/bin/cabal-3.10.1.0 -vnormal+nowrap" >> "$GITHUB_ENV"
145143
else
146144
HC=$HCDIR/bin/$HCKIND
147145
echo "HC=$HC" >> "$GITHUB_ENV"
148146
echo "HCPKG=$HCDIR/bin/$HCKIND-pkg" >> "$GITHUB_ENV"
149147
echo "HADDOCK=$HCDIR/bin/haddock" >> "$GITHUB_ENV"
150-
echo "CABAL=$HOME/.ghcup/bin/cabal-3.9.0.0 -vnormal+nowrap" >> "$GITHUB_ENV"
148+
echo "CABAL=$HOME/.ghcup/bin/cabal-3.10.1.0 -vnormal+nowrap" >> "$GITHUB_ENV"
151149
fi
152150
153151
HCNUMVER=$(${HC} --numeric-version|perl -ne '/^(\d+)\.(\d+)\.(\d+)(\.(\d+))?$/; print(10000 * $1 + 100 * $2 + ($3 == 0 ? $5 != 1 : $3))')
154152
echo "HCNUMVER=$HCNUMVER" >> "$GITHUB_ENV"
155-
if [ $((HCNUMVER >= 80200 && HCNUMVER < 90600)) -ne 0 ] ; then echo "ARG_TESTS=--enable-tests" >> "$GITHUB_ENV" ; else echo "ARG_TESTS=--disable-tests" >> "$GITHUB_ENV" ; fi
153+
if [ $((HCNUMVER >= 80200)) -ne 0 ] ; then echo "ARG_TESTS=--enable-tests" >> "$GITHUB_ENV" ; else echo "ARG_TESTS=--disable-tests" >> "$GITHUB_ENV" ; fi
156154
echo "ARG_BENCH=--enable-benchmarks" >> "$GITHUB_ENV"
157-
if [ $((HCNUMVER >= 90600)) -ne 0 ] ; then echo "HEADHACKAGE=true" >> "$GITHUB_ENV" ; else echo "HEADHACKAGE=false" >> "$GITHUB_ENV" ; fi
155+
echo "HEADHACKAGE=false" >> "$GITHUB_ENV"
158156
echo "ARG_COMPILER=--$HCKIND --with-compiler=$HC" >> "$GITHUB_ENV"
159157
echo "GHCJSARITH=0" >> "$GITHUB_ENV"
160158
env:
@@ -183,18 +181,6 @@ jobs:
183181
repository hackage.haskell.org
184182
url: http://hackage.haskell.org/
185183
EOF
186-
if $HEADHACKAGE; then
187-
cat >> $CABAL_CONFIG <<EOF
188-
repository head.hackage.ghc.haskell.org
189-
url: https://ghc.gitlab.haskell.org/head.hackage/
190-
secure: True
191-
root-keys: 7541f32a4ccca4f97aea3b22f5e593ba2c0267546016b992dfadcd2fe944e55d
192-
26021a13b401500c8eb2761ca95c61f2d625bfef951b939a8124ed12ecf07329
193-
f76d08be13e9a61a377a85e2fb63f4c5435d40f8feb3e12eb05905edb8cdea89
194-
key-threshold: 3
195-
active-repositories: hackage.haskell.org, head.hackage.ghc.haskell.org:override
196-
EOF
197-
fi
198184
cat >> $CABAL_CONFIG <<EOF
199185
program-default-options
200186
ghc-options: $GHCJOBS +RTS -M3G -RTS
@@ -211,8 +197,8 @@ jobs:
211197
- name: install cabal-plan
212198
run: |
213199
mkdir -p $HOME/.cabal/bin
214-
curl -sL https://github.com/haskell-hvr/cabal-plan/releases/download/v0.6.2.0/cabal-plan-0.6.2.0-x86_64-linux.xz > cabal-plan.xz
215-
echo 'de73600b1836d3f55e32d80385acc055fd97f60eaa0ab68a755302685f5d81bc cabal-plan.xz' | sha256sum -c -
200+
curl -sL https://github.com/haskell-hvr/cabal-plan/releases/download/v0.7.3.0/cabal-plan-0.7.3.0-x86_64-linux.xz > cabal-plan.xz
201+
echo 'f62ccb2971567a5f638f2005ad3173dba14693a45154c1508645c52289714cb2 cabal-plan.xz' | sha256sum -c -
216202
xz -d < cabal-plan.xz > $HOME/.cabal/bin/cabal-plan
217203
rm -f cabal-plan.xz
218204
chmod a+x $HOME/.cabal/bin/cabal-plan
@@ -246,9 +232,6 @@ jobs:
246232
if [ $((HCNUMVER >= 80200)) -ne 0 ] ; then echo " ghc-options: -Werror=missing-methods" >> cabal.project ; fi
247233
cat >> cabal.project <<EOF
248234
EOF
249-
if $HEADHACKAGE; then
250-
echo "allow-newer: $($HCPKG list --simple-output | sed -E 's/([a-zA-Z-]+)-[0-9.]+/*:\1,/g')" >> cabal.project
251-
fi
252235
$HCPKG list --simple-output --names-only | perl -ne 'for (split /\s+/) { print "constraints: $_ installed\n" unless /^(Cabal|regex-tdfa|text)$/; }' >> cabal.project.local
253236
cat cabal.project
254237
cat cabal.project.local
@@ -274,7 +257,7 @@ jobs:
274257
$CABAL v2-build $ARG_COMPILER $ARG_TESTS $ARG_BENCH all --write-ghc-environment-files=always
275258
- name: tests
276259
run: |
277-
if [ $((HCNUMVER >= 80200 && HCNUMVER < 90600)) -ne 0 ] ; then $CABAL v2-test $ARG_COMPILER $ARG_TESTS $ARG_BENCH all --test-show-details=direct ; fi
260+
if [ $((HCNUMVER >= 80200)) -ne 0 ] ; then $CABAL v2-test $ARG_COMPILER $ARG_TESTS $ARG_BENCH all --test-show-details=direct ; fi
278261
- name: cabal check
279262
run: |
280263
cd ${PKGDIR_regex_tdfa} || false

‎cabal.haskell-ci‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,5 +7,4 @@ constraint-set mtl-2.3
77
constraints: mtl >= 2.3, transformers >= 0.6
88

99
-- doctest-parallel requires base >= 4.10
10-
-- and does not support GHC 9.6 as of 2023-02-18
11-
tests: >= 8.2 && < 9.6
10+
tests: >= 8.2

‎regex-tdfa.cabal‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,9 @@ extra-source-files:
2525
test/cases/*.txt
2626

2727
tested-with:
28-
GHC == 9.6.0
29-
GHC == 9.4.4
30-
GHC == 9.2.6
28+
GHC == 9.6.1
29+
GHC == 9.4.5
30+
GHC == 9.2.7
3131
GHC == 9.0.2
3232
GHC == 8.10.7
3333
GHC == 8.8.4

0 commit comments

Comments
 (0)