Skip to content

Commit a4d0c08

Browse files
andreasabelandreasabel
committed
v0.30.0.2 revision 1: allow aeson-2.3
1 parent fb00ed6 commit a4d0c08

3 files changed

Lines changed: 28 additions & 30 deletions

File tree

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

Lines changed: 23 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.19.20260128
11+
# version: 0.19.20260209
1212
#
13-
# REGENDATA ("0.19.20260128",["--config=cabal.haskell-ci","github","cabal.project"])
13+
# REGENDATA ("0.19.20260209",["--config=cabal.haskell-ci","github","cabal.project"])
1414
#
1515
name: Haskell-CI
1616
on:
@@ -23,6 +23,8 @@ on:
2323
merge_group:
2424
branches:
2525
- master
26+
workflow_dispatch:
27+
{}
2628
jobs:
2729
linux:
2830
name: Haskell-CI - Linux - ${{ matrix.compiler }}
@@ -40,21 +42,16 @@ jobs:
4042
compilerVersion: 9.14.1
4143
setup-method: ghcup
4244
allow-failure: false
43-
- compiler: ghc-9.12.2
45+
- compiler: ghc-9.12.4
4446
compilerKind: ghc
45-
compilerVersion: 9.12.2
47+
compilerVersion: 9.12.4
4648
setup-method: ghcup
4749
allow-failure: false
4850
- compiler: ghc-9.10.3
4951
compilerKind: ghc
5052
compilerVersion: 9.10.3
5153
setup-method: ghcup
5254
allow-failure: false
53-
- compiler: ghc-9.10.2
54-
compilerKind: ghc
55-
compilerVersion: 9.10.2
56-
setup-method: ghcup
57-
allow-failure: false
5855
- compiler: ghc-9.8.4
5956
compilerKind: ghc
6057
compilerVersion: 9.8.4
@@ -201,8 +198,8 @@ jobs:
201198
- name: initial cabal.project for sdist
202199
run: |
203200
touch cabal.project
204-
if [ $((HCNUMVER < 91000 || HCNUMVER >= 91003)) -ne 0 ] ; then echo "packages: $GITHUB_WORKSPACE/source/." >> cabal.project ; fi
205-
if [ $((HCNUMVER >= 80400 && HCNUMVER < 91003 || HCNUMVER >= 91200)) -ne 0 ] ; then echo "packages: $GITHUB_WORKSPACE/source/samples" >> cabal.project ; fi
201+
echo "packages: $GITHUB_WORKSPACE/source/." >> cabal.project
202+
if [ $((HCNUMVER >= 80400)) -ne 0 ] ; then echo "packages: $GITHUB_WORKSPACE/source/samples" >> cabal.project ; fi
206203
cat cabal.project
207204
- name: sdist
208205
run: |
@@ -221,16 +218,16 @@ jobs:
221218
rm -f cabal.project cabal.project.local
222219
touch cabal.project
223220
touch cabal.project.local
224-
if [ $((HCNUMVER < 91000 || HCNUMVER >= 91003)) -ne 0 ] ; then echo "packages: ${PKGDIR_github}" >> cabal.project ; fi
225-
if [ $((HCNUMVER >= 80400 && HCNUMVER < 91003 || HCNUMVER >= 91200)) -ne 0 ] ; then echo "packages: ${PKGDIR_github_samples}" >> cabal.project ; fi
226-
if [ $((HCNUMVER < 91000 || HCNUMVER >= 91003)) -ne 0 ] ; then echo "package github" >> cabal.project ; fi
227-
if [ $((HCNUMVER < 91000 || HCNUMVER >= 91003)) -ne 0 ] ; then echo " ghc-options: -Werror=missing-methods -Werror=missing-fields" >> cabal.project ; fi
228-
if [ $((HCNUMVER >= 80400 && HCNUMVER < 91003 || HCNUMVER >= 91200)) -ne 0 ] ; then echo "package github-samples" >> cabal.project ; fi
229-
if [ $((HCNUMVER >= 80400 && HCNUMVER < 91003 || HCNUMVER >= 91200)) -ne 0 ] ; then echo " ghc-options: -Werror=missing-methods -Werror=missing-fields" >> cabal.project ; fi
230-
if [ $((HCNUMVER >= 90000 && HCNUMVER < 91000 || HCNUMVER >= 91003)) -ne 0 ] ; then echo "package github" >> cabal.project ; fi
231-
if [ $((HCNUMVER >= 90000 && HCNUMVER < 91000 || HCNUMVER >= 91003)) -ne 0 ] ; then echo " ghc-options: -Werror=incomplete-patterns -Werror=incomplete-uni-patterns" >> cabal.project ; fi
232-
if [ $((HCNUMVER >= 90000 && HCNUMVER < 91003 || HCNUMVER >= 91200)) -ne 0 ] ; then echo "package github-samples" >> cabal.project ; fi
233-
if [ $((HCNUMVER >= 90000 && HCNUMVER < 91003 || HCNUMVER >= 91200)) -ne 0 ] ; then echo " ghc-options: -Werror=incomplete-patterns -Werror=incomplete-uni-patterns" >> cabal.project ; fi
221+
echo "packages: ${PKGDIR_github}" >> cabal.project
222+
if [ $((HCNUMVER >= 80400)) -ne 0 ] ; then echo "packages: ${PKGDIR_github_samples}" >> cabal.project ; fi
223+
echo "package github" >> cabal.project
224+
echo " ghc-options: -Werror=missing-methods -Werror=missing-fields" >> cabal.project
225+
if [ $((HCNUMVER >= 80400)) -ne 0 ] ; then echo "package github-samples" >> cabal.project ; fi
226+
if [ $((HCNUMVER >= 80400)) -ne 0 ] ; then echo " ghc-options: -Werror=missing-methods -Werror=missing-fields" >> cabal.project ; fi
227+
if [ $((HCNUMVER >= 90000)) -ne 0 ] ; then echo "package github" >> cabal.project ; fi
228+
if [ $((HCNUMVER >= 90000)) -ne 0 ] ; then echo " ghc-options: -Werror=incomplete-patterns -Werror=incomplete-uni-patterns" >> cabal.project ; fi
229+
if [ $((HCNUMVER >= 90000)) -ne 0 ] ; then echo "package github-samples" >> cabal.project ; fi
230+
if [ $((HCNUMVER >= 90000)) -ne 0 ] ; then echo " ghc-options: -Werror=incomplete-patterns -Werror=incomplete-uni-patterns" >> cabal.project ; fi
234231
cat >> cabal.project <<EOF
235232
constraints: github +openssl
236233
constraints: github-samples +openssl
@@ -263,13 +260,13 @@ jobs:
263260
$CABAL v2-build $ARG_COMPILER $ARG_TESTS $ARG_BENCH all --write-ghc-environment-files=always
264261
- name: tests
265262
run: |
266-
if [ $((HCNUMVER < 91000 || HCNUMVER >= 91003)) -ne 0 ] ; then $CABAL v2-test $ARG_COMPILER $ARG_TESTS $ARG_BENCH all --test-show-details=direct ; fi
263+
$CABAL v2-test $ARG_COMPILER $ARG_TESTS $ARG_BENCH all --test-show-details=direct
267264
- name: cabal check
268265
run: |
269-
if [ $((HCNUMVER < 91000 || HCNUMVER >= 91003)) -ne 0 ] ; then cd ${PKGDIR_github} || false ; fi
270-
if [ $((HCNUMVER < 91000 || HCNUMVER >= 91003)) -ne 0 ] ; then ${CABAL} -vnormal check ; fi
271-
if [ $((HCNUMVER >= 80400 && HCNUMVER < 91003 || HCNUMVER >= 91200)) -ne 0 ] ; then cd ${PKGDIR_github_samples} || false ; fi
272-
if [ $((HCNUMVER >= 80400 && HCNUMVER < 91003 || HCNUMVER >= 91200)) -ne 0 ] ; then ${CABAL} -vnormal check ; fi
266+
cd ${PKGDIR_github} || false
267+
${CABAL} -vnormal check
268+
if [ $((HCNUMVER >= 80400)) -ne 0 ] ; then cd ${PKGDIR_github_samples} || false ; fi
269+
if [ $((HCNUMVER >= 80400)) -ne 0 ] ; then ${CABAL} -vnormal check ; fi
273270
- name: haddock
274271
run: |
275272
if [ $((HCNUMVER >= 80600)) -ne 0 ] ; then $CABAL v2-haddock --disable-documentation --haddock-all $ARG_COMPILER --with-haddock $HADDOCK $ARG_TESTS $ARG_BENCH all ; fi

‎github.cabal‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
cabal-version: 2.4
22
name: github
33
version: 0.30.0.2
4+
x-revision: 1
45
synopsis: Access to the GitHub API, v3.
56
category: Network
67
description:
@@ -31,7 +32,7 @@ copyright:
3132

3233
tested-with:
3334
GHC == 9.14.1
34-
GHC == 9.12.2
35+
GHC == 9.12.4
3536
GHC == 9.10.3
3637
GHC == 9.8.4
3738
GHC == 9.6.7
@@ -200,7 +201,7 @@ library
200201

201202
-- other packages
202203
build-depends:
203-
aeson >=1.4.0.0 && <1.6 || >=2.0.1.0 && <2.3
204+
aeson >=1.4.0.0 && <1.6 || >=2.0.1.0 && <2.4
204205
, base-compat >=0.11.1 && <1
205206
, base16-bytestring >=0.1.1.6 && <1.1
206207
, binary-instances >=1 && <1.1

‎samples/github-samples.cabal‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@ build-type: Simple
1111

1212
tested-with:
1313
GHC == 9.14.1
14-
GHC == 9.12.2
15-
GHC == 9.10.2
14+
GHC == 9.12.4
15+
GHC == 9.10.3
1616
GHC == 9.8.4
1717
GHC == 9.6.7
1818
GHC == 9.4.8

0 commit comments

Comments
 (0)