From 080e0fb79b220ab7fa374ccfeba91143a92d4894 Mon Sep 17 00:00:00 2001 From: Andreas Abel Date: Mon, 12 Jan 2026 10:43:50 +0100 Subject: [PATCH] Remove unused dependency transformers --- .github/workflows/haskell-ci.yml | 26 ++++++++++++++++++-------- cabal.haskell-ci | 2 ++ helf.cabal | 4 ++-- 3 files changed, 22 insertions(+), 10 deletions(-) diff --git a/.github/workflows/haskell-ci.yml b/.github/workflows/haskell-ci.yml index d581999..f67efc9 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.20250330 +# version: 0.19.20260104 # -# REGENDATA ("0.19.20250330",["github","helf.cabal"]) +# REGENDATA ("0.19.20260104",["github","helf.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 }} @@ -32,14 +35,19 @@ 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 setup-method: ghcup allow-failure: false - - compiler: ghc-9.10.1 + - compiler: ghc-9.10.3 compilerKind: ghc - compilerVersion: 9.10.1 + compilerVersion: 9.10.3 setup-method: ghcup allow-failure: false - compiler: ghc-9.8.4 @@ -110,8 +118,8 @@ jobs: chmod a+x "$HOME/.ghcup/bin/ghcup" - name: Install cabal-install run: | - "$HOME/.ghcup/bin/ghcup" install cabal 3.14.1.1-p1 || (cat "$HOME"/.ghcup/logs/*.* && false) - echo "CABAL=$HOME/.ghcup/bin/cabal-3.14.1.1-p1 -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 +195,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 +220,9 @@ jobs: touch cabal.project.local echo "packages: ${PKGDIR_helf}" >> cabal.project if [ $((HCNUMVER >= 80200)) -ne 0 ] ; then echo "package helf" >> 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 helf" >> cabal.project ; fi + if [ $((HCNUMVER >= 90400)) -ne 0 ] ; then echo " ghc-options: -Werror=unused-packages" >> cabal.project ; fi cat >> cabal.project <> cabal.project.local diff --git a/cabal.haskell-ci b/cabal.haskell-ci index 1a741a8..13ffb16 100644 --- a/cabal.haskell-ci +++ b/cabal.haskell-ci @@ -1,3 +1,5 @@ branches: master +error-incomplete-patterns: False + -- Specify 'constraint: ... installed' packages -- installed: +all -containers -mtl -transformers diff --git a/helf.cabal b/helf.cabal index ae5e75f..036a083 100644 --- a/helf.cabal +++ b/helf.cabal @@ -17,8 +17,9 @@ description: It type-checks LF definitions, but does not do type reconstruction. tested-with: + GHC == 9.14.1 GHC == 9.12.2 - GHC == 9.10.1 + GHC == 9.10.3 GHC == 9.8.4 GHC == 9.6.7 GHC == 9.4.8 @@ -92,7 +93,6 @@ executable helf , pretty >= 1.0 && < 2 , text >= 1.0.0.1 && < 3 -- text-1.0.0.1 fixes a regression in decodeUtf8 - , transformers >= 0.2 && < 1 build-tool-depends: happy:happy >= 1.18.10 && < 3 -- happy-1.18.10 has fixes for GHC 7.6.3