From 0998c2eba1e504eb77ac0dd9d4efc2ad4a2b3b59 Mon Sep 17 00:00:00 2001 From: Ben Millwood Date: Sun, 4 Jan 2026 20:22:27 +0000 Subject: [PATCH 1/2] haskell-ci regenerate --- .github/workflows/haskell-ci.yml | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-) diff --git a/.github/workflows/haskell-ci.yml b/.github/workflows/haskell-ci.yml index b000a4d..eb83593 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.20250605 +# version: 0.19.20260102 # -# REGENDATA ("0.19.20250605",["github","async.cabal"]) +# REGENDATA ("0.19.20260102",["github","async.cabal"]) # name: Haskell-CI on: @@ -20,6 +20,9 @@ on: pull_request: branches: - master + merge_group: + branches: + - master jobs: linux: name: Haskell-CI - Linux - ${{ matrix.compiler }} @@ -110,8 +113,8 @@ jobs: chmod a+x "$HOME/.ghcup/bin/ghcup" - name: Install cabal-install run: | - "$HOME/.ghcup/bin/ghcup" install cabal 3.14.2.0 || (cat "$HOME"/.ghcup/logs/*.* && false) - echo "CABAL=$HOME/.ghcup/bin/cabal-3.14.2.0 -vnormal+nowrap" >> "$GITHUB_ENV" + "$HOME/.ghcup/bin/ghcup" install cabal 3.16.0.0 || (cat "$HOME"/.ghcup/logs/*.* && false) + echo "CABAL=$HOME/.ghcup/bin/cabal-3.16.0.0 -vnormal+nowrap" >> "$GITHUB_ENV" - name: Install GHC (GHCup) if: matrix.setup-method == 'ghcup' run: | @@ -187,7 +190,7 @@ jobs: chmod a+x $HOME/.cabal/bin/cabal-plan cabal-plan --version - name: checkout - uses: actions/checkout@v4 + uses: actions/checkout@v5 with: path: source - name: initial cabal.project for sdist @@ -212,7 +215,11 @@ jobs: touch cabal.project.local echo "packages: ${PKGDIR_async}" >> cabal.project if [ $((HCNUMVER >= 80200)) -ne 0 ] ; then echo "package async" >> cabal.project ; fi - if [ $((HCNUMVER >= 80200)) -ne 0 ] ; then echo " ghc-options: -Werror=missing-methods" >> cabal.project ; fi + if [ $((HCNUMVER >= 80200)) -ne 0 ] ; then echo " ghc-options: -Werror=missing-methods -Werror=missing-fields" >> cabal.project ; fi + if [ $((HCNUMVER >= 90400)) -ne 0 ] ; then echo "package async" >> cabal.project ; fi + if [ $((HCNUMVER >= 90400)) -ne 0 ] ; then echo " ghc-options: -Werror=unused-packages" >> cabal.project ; fi + if [ $((HCNUMVER >= 90000)) -ne 0 ] ; then echo "package async" >> 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 <> cabal.project.local From 77e469d86f7521cfd28a59cd26c3385b62081ced Mon Sep 17 00:00:00 2001 From: Ben Millwood Date: Sun, 4 Jan 2026 20:24:13 +0000 Subject: [PATCH 2/2] allow base-4.22 for GHC 9.14.1 plus corresponding CI additions --- .github/workflows/haskell-ci.yml | 9 +++++++-- async.cabal | 3 ++- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/.github/workflows/haskell-ci.yml b/.github/workflows/haskell-ci.yml index eb83593..7ef8adf 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.20260102 +# version: 0.19.20260104 # -# REGENDATA ("0.19.20260102",["github","async.cabal"]) +# REGENDATA ("0.19.20260104",["github","async.cabal"]) # name: Haskell-CI on: @@ -35,6 +35,11 @@ jobs: strategy: matrix: include: + - compiler: ghc-9.14.1 + compilerKind: ghc + compilerVersion: 9.14.1 + setup-method: ghcup + allow-failure: false - compiler: ghc-9.12.2 compilerKind: ghc compilerVersion: 9.12.2 diff --git a/async.cabal b/async.cabal index a382f1e..f3f95a5 100644 --- a/async.cabal +++ b/async.cabal @@ -35,6 +35,7 @@ cabal-version: >=1.10 homepage: https://github.com/simonmar/async bug-reports: https://github.com/simonmar/async/issues tested-with: + GHC == 9.14.1 GHC == 9.12.2 GHC == 9.10.2 GHC == 9.8.4 @@ -83,7 +84,7 @@ library Control.Concurrent.Async.Internal Control.Concurrent.Async.Warden Control.Concurrent.Stream - build-depends: base >= 4.3 && < 4.22, + build-depends: base >= 4.3 && < 4.23, hashable >= 1.1.2.0 && < 1.6, stm >= 2.2 && < 2.6, unordered-containers >= 0.2 && < 0.3