Skip to content

Commit 1c2be99

Browse files
kosmikuskosmikus
authored
Merge pull request #164 from well-typed/ghc-9.6-ci
Update GHC versions, add ghc-9.6.1, update CI.
2 parents f97eaf7 + 03794e4 commit 1c2be99

File tree

3 files changed

+41
-24
lines changed

3 files changed

+41
-24
lines changed

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

Lines changed: 39 additions & 22 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.20220822
11+
# version: 0.16
1212
#
13-
# REGENDATA ("0.15.20220822",["github","--config=cabal.haskell-ci","--benchmarks-jobs=<9.0","cabal.project"])
13+
# REGENDATA ("0.16",["github","--config=cabal.haskell-ci","--benchmarks-jobs=<9.0","cabal.project"])
1414
#
1515
name: Haskell-CI
1616
on:
@@ -28,14 +28,19 @@ jobs:
2828
strategy:
2929
matrix:
3030
include:
31-
- compiler: ghc-9.4.1
31+
- compiler: ghc-9.6.1
3232
compilerKind: ghc
33-
compilerVersion: 9.4.1
33+
compilerVersion: 9.6.1
3434
setup-method: ghcup
3535
allow-failure: false
36-
- compiler: ghc-9.2.4
36+
- compiler: ghc-9.4.4
3737
compilerKind: ghc
38-
compilerVersion: 9.2.4
38+
compilerVersion: 9.4.4
39+
setup-method: ghcup
40+
allow-failure: false
41+
- compiler: ghc-9.2.7
42+
compilerKind: ghc
43+
compilerVersion: 9.2.7
3944
setup-method: ghcup
4045
allow-failure: false
4146
- compiler: ghc-9.0.2
@@ -48,9 +53,9 @@ jobs:
4853
compilerVersion: 8.10.7
4954
setup-method: ghcup
5055
allow-failure: false
51-
- compiler: ghc-8.8.2
56+
- compiler: ghc-8.8.4
5257
compilerKind: ghc
53-
compilerVersion: 8.8.2
58+
compilerVersion: 8.8.4
5459
setup-method: hvr-ppa
5560
allow-failure: false
5661
- compiler: ghc-8.6.5
@@ -81,18 +86,18 @@ jobs:
8186
apt-get install -y --no-install-recommends gnupg ca-certificates dirmngr curl git software-properties-common libtinfo5
8287
if [ "${{ matrix.setup-method }}" = ghcup ]; then
8388
mkdir -p "$HOME/.ghcup/bin"
84-
curl -sL https://downloads.haskell.org/ghcup/0.1.18.0/x86_64-linux-ghcup-0.1.18.0 > "$HOME/.ghcup/bin/ghcup"
89+
curl -sL https://downloads.haskell.org/ghcup/0.1.19.2/x86_64-linux-ghcup-0.1.19.2 > "$HOME/.ghcup/bin/ghcup"
8590
chmod a+x "$HOME/.ghcup/bin/ghcup"
8691
"$HOME/.ghcup/bin/ghcup" install ghc "$HCVER" || (cat "$HOME"/.ghcup/logs/*.* && false)
87-
"$HOME/.ghcup/bin/ghcup" install cabal 3.6.2.0 || (cat "$HOME"/.ghcup/logs/*.* && false)
92+
"$HOME/.ghcup/bin/ghcup" install cabal 3.10.1.0 || (cat "$HOME"/.ghcup/logs/*.* && false)
8893
else
8994
apt-add-repository -y 'ppa:hvr/ghc'
9095
apt-get update
9196
apt-get install -y "$HCNAME"
9297
mkdir -p "$HOME/.ghcup/bin"
93-
curl -sL https://downloads.haskell.org/ghcup/0.1.18.0/x86_64-linux-ghcup-0.1.18.0 > "$HOME/.ghcup/bin/ghcup"
98+
curl -sL https://downloads.haskell.org/ghcup/0.1.19.2/x86_64-linux-ghcup-0.1.19.2 > "$HOME/.ghcup/bin/ghcup"
9499
chmod a+x "$HOME/.ghcup/bin/ghcup"
95-
"$HOME/.ghcup/bin/ghcup" install cabal 3.6.2.0 || (cat "$HOME"/.ghcup/logs/*.* && false)
100+
"$HOME/.ghcup/bin/ghcup" install cabal 3.10.1.0 || (cat "$HOME"/.ghcup/logs/*.* && false)
96101
fi
97102
env:
98103
HCKIND: ${{ matrix.compilerKind }}
@@ -110,13 +115,13 @@ jobs:
110115
echo "HC=$HC" >> "$GITHUB_ENV"
111116
echo "HCPKG=$HOME/.ghcup/bin/$HCKIND-pkg-$HCVER" >> "$GITHUB_ENV"
112117
echo "HADDOCK=$HOME/.ghcup/bin/haddock-$HCVER" >> "$GITHUB_ENV"
113-
echo "CABAL=$HOME/.ghcup/bin/cabal-3.6.2.0 -vnormal+nowrap" >> "$GITHUB_ENV"
118+
echo "CABAL=$HOME/.ghcup/bin/cabal-3.10.1.0 -vnormal+nowrap" >> "$GITHUB_ENV"
114119
else
115120
HC=$HCDIR/bin/$HCKIND
116121
echo "HC=$HC" >> "$GITHUB_ENV"
117122
echo "HCPKG=$HCDIR/bin/$HCKIND-pkg" >> "$GITHUB_ENV"
118123
echo "HADDOCK=$HCDIR/bin/haddock" >> "$GITHUB_ENV"
119-
echo "CABAL=$HOME/.ghcup/bin/cabal-3.6.2.0 -vnormal+nowrap" >> "$GITHUB_ENV"
124+
echo "CABAL=$HOME/.ghcup/bin/cabal-3.10.1.0 -vnormal+nowrap" >> "$GITHUB_ENV"
120125
fi
121126
122127
HCNUMVER=$(${HC} --numeric-version|perl -ne '/^(\d+)\.(\d+)\.(\d+)(\.(\d+))?$/; print(10000 * $1 + 100 * $2 + ($3 == 0 ? $5 != 1 : $3))')
@@ -166,15 +171,15 @@ jobs:
166171
run: |
167172
$CABAL v2-update -v
168173
- name: cache (tools)
169-
uses: actions/cache@v2
174+
uses: actions/cache/restore@v3
170175
with:
171-
key: ${{ runner.os }}-${{ matrix.compiler }}-tools-9e28e5ef
176+
key: ${{ runner.os }}-${{ matrix.compiler }}-tools-43755058
172177
path: ~/.haskell-ci-tools
173178
- name: install cabal-plan
174179
run: |
175180
mkdir -p $HOME/.cabal/bin
176-
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
177-
echo 'de73600b1836d3f55e32d80385acc055fd97f60eaa0ab68a755302685f5d81bc cabal-plan.xz' | sha256sum -c -
181+
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
182+
echo 'f62ccb2971567a5f638f2005ad3173dba14693a45154c1508645c52289714cb2 cabal-plan.xz' | sha256sum -c -
178183
xz -d < cabal-plan.xz > $HOME/.cabal/bin/cabal-plan
179184
rm -f cabal-plan.xz
180185
chmod a+x $HOME/.cabal/bin/cabal-plan
@@ -183,8 +188,14 @@ jobs:
183188
run: |
184189
if [ $((HCNUMVER < 90000)) -ne 0 ] ; then $CABAL --store-dir=$HOME/.haskell-ci-tools/store v2-install $ARG_COMPILER --ignore-project -j2 doctest --constraint='doctest ^>=0.20' ; fi
185190
if [ $((HCNUMVER < 90000)) -ne 0 ] ; then doctest --version ; fi
191+
- name: save cache (tools)
192+
uses: actions/cache/save@v3
193+
if: always()
194+
with:
195+
key: ${{ runner.os }}-${{ matrix.compiler }}-tools-43755058
196+
path: ~/.haskell-ci-tools
186197
- name: checkout
187-
uses: actions/checkout@v2
198+
uses: actions/checkout@v3
188199
with:
189200
path: source
190201
- name: initial cabal.project for sdist
@@ -225,8 +236,8 @@ jobs:
225236
run: |
226237
$CABAL v2-build $ARG_COMPILER $ARG_TESTS $ARG_BENCH --dry-run all
227238
cabal-plan
228-
- name: cache
229-
uses: actions/cache@v2
239+
- name: restore cache
240+
uses: actions/cache/restore@v3
230241
with:
231242
key: ${{ runner.os }}-${{ matrix.compiler }}-${{ github.sha }}
232243
path: ~/.cabal/store
@@ -258,8 +269,14 @@ jobs:
258269
${CABAL} -vnormal check
259270
- name: haddock
260271
run: |
261-
$CABAL v2-haddock --haddock-all $ARG_COMPILER --with-haddock $HADDOCK $ARG_TESTS $ARG_BENCH all
272+
$CABAL v2-haddock --disable-documentation --haddock-all $ARG_COMPILER --with-haddock $HADDOCK $ARG_TESTS $ARG_BENCH all
262273
- name: unconstrained build
263274
run: |
264275
rm -f cabal.project.local
265276
$CABAL v2-build $ARG_COMPILER --disable-tests --disable-benchmarks all
277+
- name: save cache
278+
uses: actions/cache/save@v3
279+
if: always()
280+
with:
281+
key: ${{ runner.os }}-${{ matrix.compiler }}-${{ github.sha }}
282+
path: ~/.cabal/store

‎generics-sop/generics-sop.cabal‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ category: Generics
4242
build-type: Simple
4343
cabal-version: >=1.10
4444
extra-source-files: CHANGELOG.md doctest.sh
45-
tested-with: GHC == 8.0.2, GHC == 8.2.2, GHC == 8.4.4, GHC == 8.6.5, GHC == 8.8.2, GHC == 8.10.7, GHC == 9.0.2, GHC == 9.2.4, GHC == 9.4.1
45+
tested-with: GHC == 8.0.2, GHC == 8.2.2, GHC == 8.4.4, GHC == 8.6.5, GHC == 8.8.4, GHC == 8.10.7, GHC == 9.0.2, GHC == 9.2.7, GHC == 9.4.4, GHC == 9.6.1
4646

4747
source-repository head
4848
type: git

‎sop-core/sop-core.cabal‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ category: Data
2525
build-type: Simple
2626
cabal-version: >=1.10
2727
extra-source-files: CHANGELOG.md doctest.sh
28-
tested-with: GHC == 8.0.2, GHC == 8.2.2, GHC == 8.4.4, GHC == 8.6.5, GHC == 8.8.2, GHC == 8.10.7, GHC == 9.0.2, GHC == 9.2.4, GHC == 9.4.1
28+
tested-with: GHC == 8.0.2, GHC == 8.2.2, GHC == 8.4.4, GHC == 8.6.5, GHC == 8.8.4, GHC == 8.10.7, GHC == 9.0.2, GHC == 9.2.7, GHC == 9.4.4, GHC == 9.6.1
2929

3030
source-repository head
3131
type: git

0 commit comments

Comments
 (0)