Skip to content

Commit 7b9951b

Browse files
phadejphadej
authored
Merge pull request #191 from haskellari/ghc-9.8b
ghc-9.8b
2 parents 02ea4c8 + 89d4d41 commit 7b9951b

File tree

5 files changed

+53
-44
lines changed

5 files changed

+53
-44
lines changed

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

+22-15
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.20230313
11+
# version: 0.17.20231010
1212
#
13-
# REGENDATA ("0.15.20230313",["github","--project","cabal.deprecated.project","-o",".github/workflows/haskell-ci-deprecated.yml","--config","cabal.deprecated.haskell-ci"])
13+
# REGENDATA ("0.17.20231010",["github","--project","cabal.deprecated.project","-o",".github/workflows/haskell-ci-deprecated.yml","--config","cabal.deprecated.haskell-ci"])
1414
#
1515
name: Deprecated Packages
1616
on:
@@ -37,19 +37,24 @@ jobs:
3737
compilerVersion: "8.4"
3838
setup-method: hvr-ppa
3939
allow-failure: false
40-
- compiler: ghc-9.6.1
40+
- compiler: ghc-9.8.1
4141
compilerKind: ghc
42-
compilerVersion: 9.6.1
42+
compilerVersion: 9.8.1
4343
setup-method: ghcup
4444
allow-failure: false
45-
- compiler: ghc-9.4.4
45+
- compiler: ghc-9.6.3
4646
compilerKind: ghc
47-
compilerVersion: 9.4.4
47+
compilerVersion: 9.6.3
4848
setup-method: ghcup
4949
allow-failure: false
50-
- compiler: ghc-9.2.7
50+
- compiler: ghc-9.4.7
5151
compilerKind: ghc
52-
compilerVersion: 9.2.7
52+
compilerVersion: 9.4.7
53+
setup-method: ghcup
54+
allow-failure: false
55+
- compiler: ghc-9.2.8
56+
compilerKind: ghc
57+
compilerVersion: 9.2.8
5358
setup-method: ghcup
5459
allow-failure: false
5560
- compiler: ghc-9.0.2
@@ -128,7 +133,7 @@ jobs:
128133
apt-get install -y --no-install-recommends gnupg ca-certificates dirmngr curl git software-properties-common libtinfo5
129134
if [ "${{ matrix.setup-method }}" = ghcup ]; then
130135
mkdir -p "$HOME/.ghcup/bin"
131-
curl -sL https://downloads.haskell.org/ghcup/0.1.18.0/x86_64-linux-ghcup-0.1.18.0 > "$HOME/.ghcup/bin/ghcup"
136+
curl -sL https://downloads.haskell.org/ghcup/0.1.19.5/x86_64-linux-ghcup-0.1.19.5 > "$HOME/.ghcup/bin/ghcup"
132137
chmod a+x "$HOME/.ghcup/bin/ghcup"
133138
"$HOME/.ghcup/bin/ghcup" install ghc "$HCVER" || (cat "$HOME"/.ghcup/logs/*.* && false)
134139
"$HOME/.ghcup/bin/ghcup" install cabal 3.10.1.0 || (cat "$HOME"/.ghcup/logs/*.* && false)
@@ -140,7 +145,7 @@ jobs:
140145
apt-get update
141146
if [ $((GHCJSARITH)) -ne 0 ] ; then apt-get install -y "$HCNAME" ghc-8.4.4 nodejs ; else apt-get install -y "$HCNAME" ; fi
142147
mkdir -p "$HOME/.ghcup/bin"
143-
curl -sL https://downloads.haskell.org/ghcup/0.1.18.0/x86_64-linux-ghcup-0.1.18.0 > "$HOME/.ghcup/bin/ghcup"
148+
curl -sL https://downloads.haskell.org/ghcup/0.1.19.5/x86_64-linux-ghcup-0.1.19.5 > "$HOME/.ghcup/bin/ghcup"
144149
chmod a+x "$HOME/.ghcup/bin/ghcup"
145150
"$HOME/.ghcup/bin/ghcup" install cabal 3.10.1.0 || (cat "$HOME"/.ghcup/logs/*.* && false)
146151
fi
@@ -157,10 +162,12 @@ jobs:
157162
echo "CABAL_CONFIG=$HOME/.cabal/config" >> "$GITHUB_ENV"
158163
HCDIR=/opt/$HCKIND/$HCVER
159164
if [ "${{ matrix.setup-method }}" = ghcup ]; then
160-
HC=$HOME/.ghcup/bin/$HCKIND-$HCVER
165+
HC=$("$HOME/.ghcup/bin/ghcup" whereis ghc "$HCVER")
166+
HCPKG=$(echo "$HC" | sed 's#ghc$#ghc-pkg#')
167+
HADDOCK=$(echo "$HC" | sed 's#ghc$#haddock#')
161168
echo "HC=$HC" >> "$GITHUB_ENV"
162-
echo "HCPKG=$HOME/.ghcup/bin/$HCKIND-pkg-$HCVER" >> "$GITHUB_ENV"
163-
echo "HADDOCK=$HOME/.ghcup/bin/haddock-$HCVER" >> "$GITHUB_ENV"
169+
echo "HCPKG=$HCPKG" >> "$GITHUB_ENV"
170+
echo "HADDOCK=$HADDOCK" >> "$GITHUB_ENV"
164171
echo "CABAL=$HOME/.ghcup/bin/cabal-3.10.1.0 -vnormal+nowrap" >> "$GITHUB_ENV"
165172
else
166173
HC=$HCDIR/bin/$HCKIND
@@ -220,8 +227,8 @@ jobs:
220227
- name: install cabal-plan
221228
run: |
222229
mkdir -p $HOME/.cabal/bin
223-
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
224-
echo 'de73600b1836d3f55e32d80385acc055fd97f60eaa0ab68a755302685f5d81bc cabal-plan.xz' | sha256sum -c -
230+
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
231+
echo 'f62ccb2971567a5f638f2005ad3173dba14693a45154c1508645c52289714cb2 cabal-plan.xz' | sha256sum -c -
225232
xz -d < cabal-plan.xz > $HOME/.cabal/bin/cabal-plan
226233
rm -f cabal-plan.xz
227234
chmod a+x $HOME/.cabal/bin/cabal-plan

‎.github/workflows/haskell-ci.yml

+23-25
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.17.20231004
11+
# version: 0.17.20231010
1212
#
13-
# REGENDATA ("0.17.20231004",["github","cabal.project"])
13+
# REGENDATA ("0.17.20231010",["github","cabal.project"])
1414
#
1515
name: Haskell-CI
1616
on:
@@ -37,9 +37,9 @@ jobs:
3737
compilerVersion: "8.4"
3838
setup-method: hvr-ppa
3939
allow-failure: false
40-
- compiler: ghc-9.8.0.20230929
40+
- compiler: ghc-9.8.1
4141
compilerKind: ghc
42-
compilerVersion: 9.8.0.20230929
42+
compilerVersion: 9.8.1
4343
setup-method: ghcup
4444
allow-failure: false
4545
- compiler: ghc-9.6.3
@@ -135,7 +135,6 @@ jobs:
135135
mkdir -p "$HOME/.ghcup/bin"
136136
curl -sL https://downloads.haskell.org/ghcup/0.1.19.5/x86_64-linux-ghcup-0.1.19.5 > "$HOME/.ghcup/bin/ghcup"
137137
chmod a+x "$HOME/.ghcup/bin/ghcup"
138-
"$HOME/.ghcup/bin/ghcup" config add-release-channel https://raw.githubusercontent.com/haskell/ghcup-metadata/master/ghcup-prereleases-0.0.7.yaml;
139138
"$HOME/.ghcup/bin/ghcup" install ghc "$HCVER" || (cat "$HOME"/.ghcup/logs/*.* && false)
140139
"$HOME/.ghcup/bin/ghcup" install cabal 3.10.1.0 || (cat "$HOME"/.ghcup/logs/*.* && false)
141140
else
@@ -148,7 +147,6 @@ jobs:
148147
mkdir -p "$HOME/.ghcup/bin"
149148
curl -sL https://downloads.haskell.org/ghcup/0.1.19.5/x86_64-linux-ghcup-0.1.19.5 > "$HOME/.ghcup/bin/ghcup"
150149
chmod a+x "$HOME/.ghcup/bin/ghcup"
151-
"$HOME/.ghcup/bin/ghcup" config add-release-channel https://raw.githubusercontent.com/haskell/ghcup-metadata/master/ghcup-prereleases-0.0.7.yaml;
152150
"$HOME/.ghcup/bin/ghcup" install cabal 3.10.1.0 || (cat "$HOME"/.ghcup/logs/*.* && false)
153151
fi
154152
env:
@@ -243,11 +241,11 @@ jobs:
243241
run: |
244242
touch cabal.project
245243
echo "packages: $GITHUB_WORKSPACE/source/these" >> cabal.project
246-
if [ $((GHCJSARITH || ! GHCJSARITH && HCNUMVER >= 80000 && HCNUMVER < 90800)) -ne 0 ] ; then echo "packages: $GITHUB_WORKSPACE/source/these-lens" >> cabal.project ; fi
244+
if [ $((GHCJSARITH || ! GHCJSARITH && HCNUMVER >= 80000)) -ne 0 ] ; then echo "packages: $GITHUB_WORKSPACE/source/these-lens" >> cabal.project ; fi
247245
if [ $((GHCJSARITH || ! GHCJSARITH && HCNUMVER >= 80000)) -ne 0 ] ; then echo "packages: $GITHUB_WORKSPACE/source/these-optics" >> cabal.project ; fi
248246
echo "packages: $GITHUB_WORKSPACE/source/semialign" >> cabal.project
249-
if [ $((GHCJSARITH || ! GHCJSARITH && HCNUMVER < 90800)) -ne 0 ] ; then echo "packages: $GITHUB_WORKSPACE/source/monad-chronicle" >> cabal.project ; fi
250-
if [ $((GHCJSARITH || ! GHCJSARITH && HCNUMVER < 90800)) -ne 0 ] ; then echo "packages: $GITHUB_WORKSPACE/source/these-tests" >> cabal.project ; fi
247+
echo "packages: $GITHUB_WORKSPACE/source/monad-chronicle" >> cabal.project
248+
echo "packages: $GITHUB_WORKSPACE/source/these-tests" >> cabal.project
251249
cat cabal.project
252250
- name: sdist
253251
run: |
@@ -275,23 +273,23 @@ jobs:
275273
touch cabal.project
276274
touch cabal.project.local
277275
echo "packages: ${PKGDIR_these}" >> cabal.project
278-
if [ $((GHCJSARITH || ! GHCJSARITH && HCNUMVER >= 80000 && HCNUMVER < 90800)) -ne 0 ] ; then echo "packages: ${PKGDIR_these_lens}" >> cabal.project ; fi
276+
if [ $((GHCJSARITH || ! GHCJSARITH && HCNUMVER >= 80000)) -ne 0 ] ; then echo "packages: ${PKGDIR_these_lens}" >> cabal.project ; fi
279277
if [ $((GHCJSARITH || ! GHCJSARITH && HCNUMVER >= 80000)) -ne 0 ] ; then echo "packages: ${PKGDIR_these_optics}" >> cabal.project ; fi
280278
echo "packages: ${PKGDIR_semialign}" >> cabal.project
281-
if [ $((GHCJSARITH || ! GHCJSARITH && HCNUMVER < 90800)) -ne 0 ] ; then echo "packages: ${PKGDIR_monad_chronicle}" >> cabal.project ; fi
282-
if [ $((GHCJSARITH || ! GHCJSARITH && HCNUMVER < 90800)) -ne 0 ] ; then echo "packages: ${PKGDIR_these_tests}" >> cabal.project ; fi
279+
echo "packages: ${PKGDIR_monad_chronicle}" >> cabal.project
280+
echo "packages: ${PKGDIR_these_tests}" >> cabal.project
283281
if [ $((GHCJSARITH || ! GHCJSARITH && HCNUMVER >= 80200)) -ne 0 ] ; then echo "package these" >> cabal.project ; fi
284282
if [ $((GHCJSARITH || ! GHCJSARITH && HCNUMVER >= 80200)) -ne 0 ] ; then echo " ghc-options: -Werror=missing-methods" >> cabal.project ; fi
285-
if [ $((GHCJSARITH || ! GHCJSARITH && HCNUMVER >= 80200 && HCNUMVER < 90800)) -ne 0 ] ; then echo "package these-lens" >> cabal.project ; fi
286-
if [ $((GHCJSARITH || ! GHCJSARITH && HCNUMVER >= 80200 && HCNUMVER < 90800)) -ne 0 ] ; then echo " ghc-options: -Werror=missing-methods" >> cabal.project ; fi
283+
if [ $((GHCJSARITH || ! GHCJSARITH && HCNUMVER >= 80200)) -ne 0 ] ; then echo "package these-lens" >> cabal.project ; fi
284+
if [ $((GHCJSARITH || ! GHCJSARITH && HCNUMVER >= 80200)) -ne 0 ] ; then echo " ghc-options: -Werror=missing-methods" >> cabal.project ; fi
287285
if [ $((GHCJSARITH || ! GHCJSARITH && HCNUMVER >= 80200)) -ne 0 ] ; then echo "package these-optics" >> cabal.project ; fi
288286
if [ $((GHCJSARITH || ! GHCJSARITH && HCNUMVER >= 80200)) -ne 0 ] ; then echo " ghc-options: -Werror=missing-methods" >> cabal.project ; fi
289287
if [ $((GHCJSARITH || ! GHCJSARITH && HCNUMVER >= 80200)) -ne 0 ] ; then echo "package semialign" >> cabal.project ; fi
290288
if [ $((GHCJSARITH || ! GHCJSARITH && HCNUMVER >= 80200)) -ne 0 ] ; then echo " ghc-options: -Werror=missing-methods" >> cabal.project ; fi
291-
if [ $((GHCJSARITH || ! GHCJSARITH && HCNUMVER >= 80200 && HCNUMVER < 90800)) -ne 0 ] ; then echo "package monad-chronicle" >> cabal.project ; fi
292-
if [ $((GHCJSARITH || ! GHCJSARITH && HCNUMVER >= 80200 && HCNUMVER < 90800)) -ne 0 ] ; then echo " ghc-options: -Werror=missing-methods" >> cabal.project ; fi
293-
if [ $((GHCJSARITH || ! GHCJSARITH && HCNUMVER >= 80200 && HCNUMVER < 90800)) -ne 0 ] ; then echo "package these-tests" >> cabal.project ; fi
294-
if [ $((GHCJSARITH || ! GHCJSARITH && HCNUMVER >= 80200 && HCNUMVER < 90800)) -ne 0 ] ; then echo " ghc-options: -Werror=missing-methods" >> cabal.project ; fi
289+
if [ $((GHCJSARITH || ! GHCJSARITH && HCNUMVER >= 80200)) -ne 0 ] ; then echo "package monad-chronicle" >> cabal.project ; fi
290+
if [ $((GHCJSARITH || ! GHCJSARITH && HCNUMVER >= 80200)) -ne 0 ] ; then echo " ghc-options: -Werror=missing-methods" >> cabal.project ; fi
291+
if [ $((GHCJSARITH || ! GHCJSARITH && HCNUMVER >= 80200)) -ne 0 ] ; then echo "package these-tests" >> cabal.project ; fi
292+
if [ $((GHCJSARITH || ! GHCJSARITH && HCNUMVER >= 80200)) -ne 0 ] ; then echo " ghc-options: -Werror=missing-methods" >> cabal.project ; fi
295293
cat >> cabal.project <<EOF
296294
EOF
297295
$HCPKG list --simple-output --names-only | perl -ne 'for (split /\s+/) { print "constraints: $_ installed\n" unless /^(monad-chronicle|semialign|these|these-lens|these-optics|these-tests)$/; }' >> cabal.project.local
@@ -315,7 +313,7 @@ jobs:
315313
$CABAL v2-build $ARG_COMPILER $ARG_TESTS $ARG_BENCH all --write-ghc-environment-files=always
316314
- name: tests
317315
run: |
318-
if [ $((! GHCJSARITH && HCNUMVER < 90800)) -ne 0 ] ; then $CABAL v2-test $ARG_COMPILER $ARG_TESTS $ARG_BENCH all --test-show-details=direct ; fi
316+
if [ $((! GHCJSARITH)) -ne 0 ] ; then $CABAL v2-test $ARG_COMPILER $ARG_TESTS $ARG_BENCH all --test-show-details=direct ; fi
319317
pkgdir() {
320318
case $1 in
321319
these) echo ${PKGDIR_these} ;;
@@ -332,16 +330,16 @@ jobs:
332330
run: |
333331
cd ${PKGDIR_these} || false
334332
${CABAL} -vnormal check
335-
if [ $((GHCJSARITH || ! GHCJSARITH && HCNUMVER >= 80000 && HCNUMVER < 90800)) -ne 0 ] ; then cd ${PKGDIR_these_lens} || false ; fi
336-
if [ $((GHCJSARITH || ! GHCJSARITH && HCNUMVER >= 80000 && HCNUMVER < 90800)) -ne 0 ] ; then ${CABAL} -vnormal check ; fi
333+
if [ $((GHCJSARITH || ! GHCJSARITH && HCNUMVER >= 80000)) -ne 0 ] ; then cd ${PKGDIR_these_lens} || false ; fi
334+
if [ $((GHCJSARITH || ! GHCJSARITH && HCNUMVER >= 80000)) -ne 0 ] ; then ${CABAL} -vnormal check ; fi
337335
if [ $((GHCJSARITH || ! GHCJSARITH && HCNUMVER >= 80000)) -ne 0 ] ; then cd ${PKGDIR_these_optics} || false ; fi
338336
if [ $((GHCJSARITH || ! GHCJSARITH && HCNUMVER >= 80000)) -ne 0 ] ; then ${CABAL} -vnormal check ; fi
339337
cd ${PKGDIR_semialign} || false
340338
${CABAL} -vnormal check
341-
if [ $((GHCJSARITH || ! GHCJSARITH && HCNUMVER < 90800)) -ne 0 ] ; then cd ${PKGDIR_monad_chronicle} || false ; fi
342-
if [ $((GHCJSARITH || ! GHCJSARITH && HCNUMVER < 90800)) -ne 0 ] ; then ${CABAL} -vnormal check ; fi
343-
if [ $((GHCJSARITH || ! GHCJSARITH && HCNUMVER < 90800)) -ne 0 ] ; then cd ${PKGDIR_these_tests} || false ; fi
344-
if [ $((GHCJSARITH || ! GHCJSARITH && HCNUMVER < 90800)) -ne 0 ] ; then ${CABAL} -vnormal check ; fi
339+
cd ${PKGDIR_monad_chronicle} || false
340+
${CABAL} -vnormal check
341+
cd ${PKGDIR_these_tests} || false
342+
${CABAL} -vnormal check
345343
- name: haddock
346344
run: |
347345
if [ $((! GHCJSARITH)) -ne 0 ] ; then $CABAL v2-haddock --disable-documentation --haddock-all $ARG_COMPILER --with-haddock $HADDOCK $ARG_TESTS $ARG_BENCH all ; fi

‎monad-chronicle/monad-chronicle.cabal

+3-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
cabal-version: >=1.10
22
name: monad-chronicle
33
version: 1.0.1
4-
x-revision: 2
4+
x-revision: 3
55
synopsis: These as a transformer, ChronicleT
66
homepage: https://github.com/haskellari/these
77
license: BSD3
@@ -31,6 +31,7 @@ tested-with:
3131
|| ==9.2.8
3232
|| ==9.4.7
3333
|| ==9.6.3
34+
|| ==9.8.1
3435
, GHCJS ==8.4
3536

3637
source-repository head
@@ -57,7 +58,7 @@ library
5758

5859
-- ghc boot libs
5960
build-depends:
60-
base >=4.5.1.0 && <4.19
61+
base >=4.5.1.0 && <4.20
6162
, mtl >=2.1.3 && <2.4
6263
, transformers >=0.3.0.0 && <0.7
6364

‎these-lens/these-lens.cabal

+3-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
cabal-version: >=1.10
22
name: these-lens
33
version: 1.0.1.3
4+
x-revision: 1
45
synopsis: Lenses for These
56
homepage: https://github.com/haskellari/these
67
license: BSD3
@@ -22,6 +23,7 @@ tested-with:
2223
|| ==9.2.8
2324
|| ==9.4.7
2425
|| ==9.6.3
26+
|| ==9.8.1
2527
, GHCJS ==8.4
2628

2729
source-repository head
@@ -40,7 +42,7 @@ library
4042
exposed-modules: Data.These.Lens
4143

4244
-- ghc boot libs
43-
build-depends: base >=4.9 && <4.19
45+
build-depends: base >=4.9 && <4.20
4446
build-depends: these >=1.2 && <1.3
4547

4648
-- other dependencies

‎these-tests/these-tests.cabal

+2-1
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@ tested-with:
2727
|| ==9.2.8
2828
|| ==9.4.7
2929
|| ==9.6.3
30+
|| ==9.8.1
3031
, GHCJS ==8.4
3132

3233
source-repository head
@@ -84,7 +85,7 @@ test-suite test
8485
-- additional dependencies
8586
build-depends:
8687
quickcheck-instances >=0.3.23 && <0.4
87-
, tasty >=1.2 && <1.5
88+
, tasty >=1.2 && <1.6
8889
, tasty-quickcheck >=0.10 && <0.11
8990
, transformers-compat >=0.6.5 && <0.8
9091

0 commit comments

Comments
 (0)