diff --git a/.github/workflows/haskell-ci.yml b/.github/workflows/haskell-ci.yml index 1ad7c8e4..9a2cab26 100644 --- a/.github/workflows/haskell-ci.yml +++ b/.github/workflows/haskell-ci.yml @@ -8,9 +8,9 @@ # # For more information, see https://github.com/haskell-CI/haskell-ci # -# version: 0.19.20260128 +# version: 0.19.20260209 # -# REGENDATA ("0.19.20260128",["--config=cabal.haskell-ci","github","cabal.project"]) +# REGENDATA ("0.19.20260209",["--config=cabal.haskell-ci","github","cabal.project"]) # name: Haskell-CI on: @@ -23,6 +23,8 @@ on: merge_group: branches: - master + workflow_dispatch: + {} jobs: linux: name: Haskell-CI - Linux - ${{ matrix.compiler }} @@ -40,9 +42,9 @@ jobs: compilerVersion: 9.14.1 setup-method: ghcup allow-failure: false - - compiler: ghc-9.12.2 + - compiler: ghc-9.12.4 compilerKind: ghc - compilerVersion: 9.12.2 + compilerVersion: 9.12.4 setup-method: ghcup allow-failure: false - compiler: ghc-9.10.3 @@ -50,11 +52,6 @@ jobs: compilerVersion: 9.10.3 setup-method: ghcup allow-failure: false - - compiler: ghc-9.10.2 - compilerKind: ghc - compilerVersion: 9.10.2 - setup-method: ghcup - allow-failure: false - compiler: ghc-9.8.4 compilerKind: ghc compilerVersion: 9.8.4 @@ -201,8 +198,8 @@ jobs: - name: initial cabal.project for sdist run: | touch cabal.project - if [ $((HCNUMVER < 91000 || HCNUMVER >= 91003)) -ne 0 ] ; then echo "packages: $GITHUB_WORKSPACE/source/." >> cabal.project ; fi - if [ $((HCNUMVER >= 80400 && HCNUMVER < 91003 || HCNUMVER >= 91200)) -ne 0 ] ; then echo "packages: $GITHUB_WORKSPACE/source/samples" >> cabal.project ; fi + echo "packages: $GITHUB_WORKSPACE/source/." >> cabal.project + if [ $((HCNUMVER >= 80400)) -ne 0 ] ; then echo "packages: $GITHUB_WORKSPACE/source/samples" >> cabal.project ; fi cat cabal.project - name: sdist run: | @@ -221,16 +218,16 @@ jobs: rm -f cabal.project cabal.project.local touch cabal.project touch cabal.project.local - if [ $((HCNUMVER < 91000 || HCNUMVER >= 91003)) -ne 0 ] ; then echo "packages: ${PKGDIR_github}" >> cabal.project ; fi - if [ $((HCNUMVER >= 80400 && HCNUMVER < 91003 || HCNUMVER >= 91200)) -ne 0 ] ; then echo "packages: ${PKGDIR_github_samples}" >> cabal.project ; fi - if [ $((HCNUMVER < 91000 || HCNUMVER >= 91003)) -ne 0 ] ; then echo "package github" >> cabal.project ; fi - if [ $((HCNUMVER < 91000 || HCNUMVER >= 91003)) -ne 0 ] ; then echo " ghc-options: -Werror=missing-methods -Werror=missing-fields" >> cabal.project ; fi - if [ $((HCNUMVER >= 80400 && HCNUMVER < 91003 || HCNUMVER >= 91200)) -ne 0 ] ; then echo "package github-samples" >> cabal.project ; fi - if [ $((HCNUMVER >= 80400 && HCNUMVER < 91003 || HCNUMVER >= 91200)) -ne 0 ] ; then echo " ghc-options: -Werror=missing-methods -Werror=missing-fields" >> cabal.project ; fi - if [ $((HCNUMVER >= 90000 && HCNUMVER < 91000 || HCNUMVER >= 91003)) -ne 0 ] ; then echo "package github" >> cabal.project ; fi - if [ $((HCNUMVER >= 90000 && HCNUMVER < 91000 || HCNUMVER >= 91003)) -ne 0 ] ; then echo " ghc-options: -Werror=incomplete-patterns -Werror=incomplete-uni-patterns" >> cabal.project ; fi - if [ $((HCNUMVER >= 90000 && HCNUMVER < 91003 || HCNUMVER >= 91200)) -ne 0 ] ; then echo "package github-samples" >> cabal.project ; fi - if [ $((HCNUMVER >= 90000 && HCNUMVER < 91003 || HCNUMVER >= 91200)) -ne 0 ] ; then echo " ghc-options: -Werror=incomplete-patterns -Werror=incomplete-uni-patterns" >> cabal.project ; fi + echo "packages: ${PKGDIR_github}" >> cabal.project + if [ $((HCNUMVER >= 80400)) -ne 0 ] ; then echo "packages: ${PKGDIR_github_samples}" >> cabal.project ; fi + echo "package github" >> cabal.project + echo " ghc-options: -Werror=missing-methods -Werror=missing-fields" >> cabal.project + if [ $((HCNUMVER >= 80400)) -ne 0 ] ; then echo "package github-samples" >> cabal.project ; fi + if [ $((HCNUMVER >= 80400)) -ne 0 ] ; then echo " ghc-options: -Werror=missing-methods -Werror=missing-fields" >> cabal.project ; fi + if [ $((HCNUMVER >= 90000)) -ne 0 ] ; then echo "package github" >> cabal.project ; fi + if [ $((HCNUMVER >= 90000)) -ne 0 ] ; then echo " ghc-options: -Werror=incomplete-patterns -Werror=incomplete-uni-patterns" >> cabal.project ; fi + if [ $((HCNUMVER >= 90000)) -ne 0 ] ; then echo "package github-samples" >> cabal.project ; fi + if [ $((HCNUMVER >= 90000)) -ne 0 ] ; then echo " ghc-options: -Werror=incomplete-patterns -Werror=incomplete-uni-patterns" >> cabal.project ; fi cat >> cabal.project <= 91003)) -ne 0 ] ; then $CABAL v2-test $ARG_COMPILER $ARG_TESTS $ARG_BENCH all --test-show-details=direct ; fi + $CABAL v2-test $ARG_COMPILER $ARG_TESTS $ARG_BENCH all --test-show-details=direct - name: cabal check run: | - if [ $((HCNUMVER < 91000 || HCNUMVER >= 91003)) -ne 0 ] ; then cd ${PKGDIR_github} || false ; fi - if [ $((HCNUMVER < 91000 || HCNUMVER >= 91003)) -ne 0 ] ; then ${CABAL} -vnormal check ; fi - if [ $((HCNUMVER >= 80400 && HCNUMVER < 91003 || HCNUMVER >= 91200)) -ne 0 ] ; then cd ${PKGDIR_github_samples} || false ; fi - if [ $((HCNUMVER >= 80400 && HCNUMVER < 91003 || HCNUMVER >= 91200)) -ne 0 ] ; then ${CABAL} -vnormal check ; fi + cd ${PKGDIR_github} || false + ${CABAL} -vnormal check + if [ $((HCNUMVER >= 80400)) -ne 0 ] ; then cd ${PKGDIR_github_samples} || false ; fi + if [ $((HCNUMVER >= 80400)) -ne 0 ] ; then ${CABAL} -vnormal check ; fi - name: haddock run: | if [ $((HCNUMVER >= 80600)) -ne 0 ] ; then $CABAL v2-haddock --disable-documentation --haddock-all $ARG_COMPILER --with-haddock $HADDOCK $ARG_TESTS $ARG_BENCH all ; fi diff --git a/github.cabal b/github.cabal index 33086d11..8b9945ef 100644 --- a/github.cabal +++ b/github.cabal @@ -1,6 +1,7 @@ cabal-version: 2.4 name: github version: 0.30.0.2 +x-revision: 1 synopsis: Access to the GitHub API, v3. category: Network description: @@ -31,7 +32,7 @@ copyright: tested-with: GHC == 9.14.1 - GHC == 9.12.2 + GHC == 9.12.4 GHC == 9.10.3 GHC == 9.8.4 GHC == 9.6.7 @@ -200,7 +201,7 @@ library -- other packages build-depends: - aeson >=1.4.0.0 && <1.6 || >=2.0.1.0 && <2.3 + aeson >=1.4.0.0 && <1.6 || >=2.0.1.0 && <2.4 , base-compat >=0.11.1 && <1 , base16-bytestring >=0.1.1.6 && <1.1 , binary-instances >=1 && <1.1 diff --git a/samples/github-samples.cabal b/samples/github-samples.cabal index 2e7a8699..50b5d4af 100644 --- a/samples/github-samples.cabal +++ b/samples/github-samples.cabal @@ -11,8 +11,8 @@ build-type: Simple tested-with: GHC == 9.14.1 - GHC == 9.12.2 - GHC == 9.10.2 + GHC == 9.12.4 + GHC == 9.10.3 GHC == 9.8.4 GHC == 9.6.7 GHC == 9.4.8