Skip to content

Commit 60dd89b

Browse files
andreasabelandreasabel
committed
Bump stack CI to GHC 9.6.2
1 parent 37220b7 commit 60dd89b

File tree

8 files changed

+44
-55
lines changed

8 files changed

+44
-55
lines changed

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

Lines changed: 21 additions & 35 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.20230203
11+
# version: 0.16.4
1212
#
13-
# REGENDATA ("0.15.20230203",["github","fix-whitespace.cabal"])
13+
# REGENDATA ("0.16.4",["github","fix-whitespace.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.20230128
37+
- compiler: ghc-9.6.2
3838
compilerKind: ghc
39-
compilerVersion: 9.6.0.20230128
39+
compilerVersion: 9.6.2
4040
setup-method: ghcup
41-
allow-failure: true
42-
- compiler: ghc-9.4.4
41+
allow-failure: false
42+
- compiler: ghc-9.4.5
4343
compilerKind: ghc
44-
compilerVersion: 9.4.4
44+
compilerVersion: 9.4.5
4545
setup-method: ghcup
4646
allow-failure: false
47-
- compiler: ghc-9.2.5
47+
- compiler: ghc-9.2.8
4848
compilerKind: ghc
49-
compilerVersion: 9.2.5
49+
compilerVersion: 9.2.8
5050
setup-method: ghcup
5151
allow-failure: false
5252
- compiler: ghc-9.0.2
@@ -92,20 +92,18 @@ jobs:
9292
apt-get install -y --no-install-recommends gnupg ca-certificates dirmngr curl git software-properties-common libtinfo5
9393
if [ "${{ matrix.setup-method }}" = ghcup ]; then
9494
mkdir -p "$HOME/.ghcup/bin"
95-
curl -sL https://downloads.haskell.org/ghcup/0.1.18.0/x86_64-linux-ghcup-0.1.18.0 > "$HOME/.ghcup/bin/ghcup"
95+
curl -sL https://downloads.haskell.org/ghcup/0.1.19.2/x86_64-linux-ghcup-0.1.19.2 > "$HOME/.ghcup/bin/ghcup"
9696
chmod a+x "$HOME/.ghcup/bin/ghcup"
97-
"$HOME/.ghcup/bin/ghcup" config add-release-channel https://raw.githubusercontent.com/haskell/ghcup-metadata/master/ghcup-prereleases-0.0.7.yaml;
9897
"$HOME/.ghcup/bin/ghcup" install ghc "$HCVER" || (cat "$HOME"/.ghcup/logs/*.* && false)
99-
"$HOME/.ghcup/bin/ghcup" install cabal 3.9.0.0 || (cat "$HOME"/.ghcup/logs/*.* && false)
98+
"$HOME/.ghcup/bin/ghcup" install cabal 3.10.1.0 || (cat "$HOME"/.ghcup/logs/*.* && false)
10099
else
101100
apt-add-repository -y 'ppa:hvr/ghc'
102101
apt-get update
103102
apt-get install -y "$HCNAME"
104103
mkdir -p "$HOME/.ghcup/bin"
105-
curl -sL https://downloads.haskell.org/ghcup/0.1.18.0/x86_64-linux-ghcup-0.1.18.0 > "$HOME/.ghcup/bin/ghcup"
104+
curl -sL https://downloads.haskell.org/ghcup/0.1.19.2/x86_64-linux-ghcup-0.1.19.2 > "$HOME/.ghcup/bin/ghcup"
106105
chmod a+x "$HOME/.ghcup/bin/ghcup"
107-
"$HOME/.ghcup/bin/ghcup" config add-release-channel https://raw.githubusercontent.com/haskell/ghcup-metadata/master/ghcup-prereleases-0.0.7.yaml;
108-
"$HOME/.ghcup/bin/ghcup" install cabal 3.9.0.0 || (cat "$HOME"/.ghcup/logs/*.* && false)
106+
"$HOME/.ghcup/bin/ghcup" install cabal 3.10.1.0 || (cat "$HOME"/.ghcup/logs/*.* && false)
109107
fi
110108
env:
111109
HCKIND: ${{ matrix.compilerKind }}
@@ -123,20 +121,20 @@ jobs:
123121
echo "HC=$HC" >> "$GITHUB_ENV"
124122
echo "HCPKG=$HOME/.ghcup/bin/$HCKIND-pkg-$HCVER" >> "$GITHUB_ENV"
125123
echo "HADDOCK=$HOME/.ghcup/bin/haddock-$HCVER" >> "$GITHUB_ENV"
126-
echo "CABAL=$HOME/.ghcup/bin/cabal-3.9.0.0 -vnormal+nowrap" >> "$GITHUB_ENV"
124+
echo "CABAL=$HOME/.ghcup/bin/cabal-3.10.1.0 -vnormal+nowrap" >> "$GITHUB_ENV"
127125
else
128126
HC=$HCDIR/bin/$HCKIND
129127
echo "HC=$HC" >> "$GITHUB_ENV"
130128
echo "HCPKG=$HCDIR/bin/$HCKIND-pkg" >> "$GITHUB_ENV"
131129
echo "HADDOCK=$HCDIR/bin/haddock" >> "$GITHUB_ENV"
132-
echo "CABAL=$HOME/.ghcup/bin/cabal-3.9.0.0 -vnormal+nowrap" >> "$GITHUB_ENV"
130+
echo "CABAL=$HOME/.ghcup/bin/cabal-3.10.1.0 -vnormal+nowrap" >> "$GITHUB_ENV"
133131
fi
134132
135133
HCNUMVER=$(${HC} --numeric-version|perl -ne '/^(\d+)\.(\d+)\.(\d+)(\.(\d+))?$/; print(10000 * $1 + 100 * $2 + ($3 == 0 ? $5 != 1 : $3))')
136134
echo "HCNUMVER=$HCNUMVER" >> "$GITHUB_ENV"
137135
echo "ARG_TESTS=--enable-tests" >> "$GITHUB_ENV"
138136
echo "ARG_BENCH=--enable-benchmarks" >> "$GITHUB_ENV"
139-
if [ $((HCNUMVER >= 90600)) -ne 0 ] ; then echo "HEADHACKAGE=true" >> "$GITHUB_ENV" ; else echo "HEADHACKAGE=false" >> "$GITHUB_ENV" ; fi
137+
echo "HEADHACKAGE=false" >> "$GITHUB_ENV"
140138
echo "ARG_COMPILER=--$HCKIND --with-compiler=$HC" >> "$GITHUB_ENV"
141139
echo "GHCJSARITH=0" >> "$GITHUB_ENV"
142140
env:
@@ -165,18 +163,6 @@ jobs:
165163
repository hackage.haskell.org
166164
url: http://hackage.haskell.org/
167165
EOF
168-
if $HEADHACKAGE; then
169-
cat >> $CABAL_CONFIG <<EOF
170-
repository head.hackage.ghc.haskell.org
171-
url: https://ghc.gitlab.haskell.org/head.hackage/
172-
secure: True
173-
root-keys: 7541f32a4ccca4f97aea3b22f5e593ba2c0267546016b992dfadcd2fe944e55d
174-
26021a13b401500c8eb2761ca95c61f2d625bfef951b939a8124ed12ecf07329
175-
f76d08be13e9a61a377a85e2fb63f4c5435d40f8feb3e12eb05905edb8cdea89
176-
key-threshold: 3
177-
active-repositories: hackage.haskell.org, head.hackage.ghc.haskell.org:override
178-
EOF
179-
fi
180166
cat >> $CABAL_CONFIG <<EOF
181167
program-default-options
182168
ghc-options: $GHCJOBS +RTS -M3G -RTS
@@ -193,8 +179,8 @@ jobs:
193179
- name: install cabal-plan
194180
run: |
195181
mkdir -p $HOME/.cabal/bin
196-
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
197-
echo 'de73600b1836d3f55e32d80385acc055fd97f60eaa0ab68a755302685f5d81bc cabal-plan.xz' | sha256sum -c -
182+
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
183+
echo 'f62ccb2971567a5f638f2005ad3173dba14693a45154c1508645c52289714cb2 cabal-plan.xz' | sha256sum -c -
198184
xz -d < cabal-plan.xz > $HOME/.cabal/bin/cabal-plan
199185
rm -f cabal-plan.xz
200186
chmod a+x $HOME/.cabal/bin/cabal-plan
@@ -228,9 +214,6 @@ jobs:
228214
if [ $((HCNUMVER >= 80200)) -ne 0 ] ; then echo " ghc-options: -Werror=missing-methods" >> cabal.project ; fi
229215
cat >> cabal.project <<EOF
230216
EOF
231-
if $HEADHACKAGE; then
232-
echo "allow-newer: $($HCPKG list --simple-output | sed -E 's/([a-zA-Z-]+)-[0-9.]+/*:\1,/g')" >> cabal.project
233-
fi
234217
$HCPKG list --simple-output --names-only | perl -ne 'for (split /\s+/) { print "constraints: $_ installed\n" unless /^(fix-whitespace)$/; }' >> cabal.project.local
235218
cat cabal.project
236219
cat cabal.project.local
@@ -254,6 +237,9 @@ jobs:
254237
- name: build
255238
run: |
256239
$CABAL v2-build $ARG_COMPILER $ARG_TESTS $ARG_BENCH all --write-ghc-environment-files=always
240+
- name: tests
241+
run: |
242+
$CABAL v2-test $ARG_COMPILER $ARG_TESTS $ARG_BENCH all --test-show-details=direct
257243
- name: cabal check
258244
run: |
259245
cd ${PKGDIR_fix_whitespace} || false

‎.github/workflows/stack.yml‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -73,12 +73,12 @@ jobs:
7373
strategy:
7474
matrix:
7575
os: [ubuntu-22.04]
76-
ghc-ver: [9.4.4, 9.2.5, 9.0.2, 8.10.7, 8.8.4, 8.6.5, 8.4.4]
76+
ghc-ver: [9.6.2, 9.4.5, 9.2.8, 9.0.2, 8.10.7, 8.8.4, 8.6.5, 8.4.4]
7777
include:
7878
- os: windows-2022
79-
ghc-ver: 9.4.4
79+
ghc-ver: 9.6.2
8080
- os: macos-12
81-
ghc-ver: 9.4.4
81+
ghc-ver: 9.6.2
8282
fail-fast: false
8383

8484
env:
@@ -147,15 +147,15 @@ jobs:
147147
# # Conditional to ensure this deployment is only run once per action.
148148
# if: >-
149149
# startsWith(github.ref, 'refs/tags/v')
150-
# && matrix.ghc-ver == '9.4.4'
150+
# && matrix.ghc-ver == '9.6.2'
151151
# run: |
152152
# DIST_TGZ=$(cabal sdist | tail -1)
153153
# echo "DIST_TGZ=${DIST_TGZ}" >> "${GITHUB_ENV}"
154154

155155
# - name: Source tarball release
156156
# if: >-
157157
# startsWith(github.ref, 'refs/tags/v')
158-
# && matrix.ghc-ver == '9.4.4'
158+
# && matrix.ghc-ver == '9.6.2'
159159
# # uses: softprops/action-gh-release@v1
160160
# # with:
161161
# # draft: true
@@ -176,7 +176,7 @@ jobs:
176176
if: >-
177177
startsWith(github.ref, 'refs/tags/v')
178178
&& runner.os == 'Linux'
179-
&& matrix.ghc-ver == '9.4.4'
179+
&& matrix.ghc-ver == '9.6.2'
180180
run: |
181181
FIXW_BIN=fix-whitespace-${FIXW_VERSION}-linux.binary
182182
cp -p "${FIXW_EXE}" "${FIXW_BIN}"
@@ -187,7 +187,7 @@ jobs:
187187
# if: >-
188188
# startsWith(github.ref, 'refs/tags/v')
189189
# && runner.os == 'Linux'
190-
# && matrix.ghc-ver == '9.4.4'
190+
# && matrix.ghc-ver == '9.6.2'
191191
# # uses: softprops/action-gh-release@v1
192192
# # with:
193193
# # draft: true
@@ -268,7 +268,7 @@ jobs:
268268
- name: Upload binary
269269
if: >-
270270
startsWith(github.ref, 'refs/tags/v')
271-
&& (matrix.ghc-ver == '9.4.4' || runner.os != 'Linux')
271+
&& (matrix.ghc-ver == '9.6.2' || runner.os != 'Linux')
272272
uses: actions/upload-release-asset@v1
273273
env:
274274
GITHUB_TOKEN: ${{ github.token }}

‎fix-whitespace.cabal‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,9 @@ bug-reports: https://github.com/agda/fix-whitespace/issues
1616

1717
tested-with:
1818
-- cabal-supported GHCs
19-
GHC == 9.6.0
20-
GHC == 9.4.4
21-
GHC == 9.2.5
19+
GHC == 9.6.2
20+
GHC == 9.4.5
21+
GHC == 9.2.8
2222
GHC == 9.0.2
2323
GHC == 8.10.7
2424
GHC == 8.8.4
@@ -32,9 +32,9 @@ extra-doc-files:
3232
README.md
3333
fix-whitespace.yaml
3434
-- stack-supported GHCs
35-
stack-9.4.4.yaml
36-
stack-9.2.5.yaml
37-
stack-9.2.4.yaml
35+
stack-9.6.2.yaml
36+
stack-9.4.5.yaml
37+
stack-9.2.8.yaml
3838
stack-9.0.2.yaml
3939
stack-8.10.7.yaml
4040
stack-8.8.4.yaml

‎stack-9.2.5.yaml‎

Lines changed: 0 additions & 3 deletions
This file was deleted.

‎stack-9.2.8.yaml‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
resolver: lts-20.26
2+
compiler: ghc-9.2.8
3+
compiler-check: match-exact

‎stack-9.4.4.yaml‎

Lines changed: 0 additions & 3 deletions
This file was deleted.

‎stack-9.4.5.yaml‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
resolver: lts-21.0
2+
compiler: ghc-9.4.5
3+
compiler-check: match-exact

‎stack-9.6.2.yaml‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
resolver: nightly-2023-06-22
2+
compiler: ghc-9.6.2
3+
compiler-check: match-exact

0 commit comments

Comments
 (0)