From d1c3b407f92968f8cb338d228a62cc32ed58fdfc Mon Sep 17 00:00:00 2001 From: NH000 Date: Sun, 15 Feb 2026 14:41:52 +0100 Subject: [PATCH 1/6] Added tests and support for GHC-9.10.3 to 9.14.1 --- .github/workflows/haskell-ci.yml | 45 ++++++++++++++++++++++++-------- hgettext.cabal | 13 +++++---- 2 files changed, 42 insertions(+), 16 deletions(-) diff --git a/.github/workflows/haskell-ci.yml b/.github/workflows/haskell-ci.yml index ec81002..fd3700b 100644 --- a/.github/workflows/haskell-ci.yml +++ b/.github/workflows/haskell-ci.yml @@ -6,11 +6,11 @@ # # haskell-ci regenerate # -# For more information, see https://github.com/andreasabel/haskell-ci +# For more information, see https://github.com/haskell-CI/haskell-ci # -# version: 0.19.20241219 +# version: 0.19.20260209 # -# REGENDATA ("0.19.20241219",["github","hgettext.cabal"]) +# REGENDATA ("0.19.20260209",["github","hgettext.cabal"]) # name: Haskell-CI on: @@ -20,10 +20,15 @@ on: pull_request: branches: - master + merge_group: + branches: + - master + workflow_dispatch: + {} jobs: linux: name: Haskell-CI - Linux - ${{ matrix.compiler }} - runs-on: ubuntu-20.04 + runs-on: ubuntu-24.04 timeout-minutes: 60 container: @@ -32,6 +37,21 @@ 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.3 + compilerKind: ghc + compilerVersion: 9.10.3 + setup-method: ghcup + allow-failure: false - compiler: ghc-9.10.1 compilerKind: ghc compilerVersion: 9.10.1 @@ -101,13 +121,12 @@ jobs: - name: Install GHCup run: | mkdir -p "$HOME/.ghcup/bin" - curl -sL https://downloads.haskell.org/ghcup/0.1.30.0/x86_64-linux-ghcup-0.1.30.0 > "$HOME/.ghcup/bin/ghcup" + curl -sL https://downloads.haskell.org/ghcup/0.1.50.1/x86_64-linux-ghcup-0.1.50.1 > "$HOME/.ghcup/bin/ghcup" chmod a+x "$HOME/.ghcup/bin/ghcup" - - name: Install cabal-install (prerelease) + - name: Install cabal-install run: | - "$HOME/.ghcup/bin/ghcup" config add-release-channel https://raw.githubusercontent.com/haskell/ghcup-metadata/master/ghcup-prereleases-0.0.8.yaml; - "$HOME/.ghcup/bin/ghcup" install cabal 3.15.0.0.2024.10.3 || (cat "$HOME"/.ghcup/logs/*.* && false) - echo "CABAL=$HOME/.ghcup/bin/cabal-3.15.0.0.2024.10.3 -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: | @@ -183,7 +202,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 @@ -208,7 +227,11 @@ jobs: touch cabal.project.local echo "packages: ${PKGDIR_hgettext}" >> cabal.project if [ $((HCNUMVER >= 80200)) -ne 0 ] ; then echo "package hgettext" >> 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 hgettext" >> 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 hgettext" >> 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 diff --git a/hgettext.cabal b/hgettext.cabal index e979819..9915923 100644 --- a/hgettext.cabal +++ b/hgettext.cabal @@ -19,6 +19,9 @@ description: This package provides bindings to the @gettext@ internation A user-contributed tutorial can be found in the [Haskell Wiki](https://wiki.haskell.org/Internationalization_of_Haskell_programs_using_gettext). tested-with: + GHC == 9.14.1 + GHC == 9.12.2 + GHC == 9.10.3 GHC == 9.10.1 GHC == 9.8.4 GHC == 9.6.6 @@ -51,9 +54,9 @@ library other-modules: Internal hs-source-dirs: src - build-depends: base >=4.5 && <4.22 - , Cabal >=1.14 && <1.25 || >= 2.0 && < 2.5 || >=3.0 && <3.15 - , containers >=0.4.2 && <0.8 + build-depends: base >=4.5 && <4.23 + , Cabal >=1.14 && <1.25 || >= 2.0 && < 2.5 || >=3.0 && <3.17 + , containers >=0.4.2 && <0.9 , directory >=1.1 && <1.4 , filepath >=1.3 && <1.6 , process >=1.1 && <1.7 @@ -80,8 +83,8 @@ executable hgettext , containers , filepath - build-depends: deepseq >=1.1 && <1.6 - , cpphs >=1.20.9.1 && <1.20.10 + build-depends: deepseq >=1.1 && <1.7 + , cpphs >=1.20.9.1 && <1.20.11 , haskell-src-exts >=1.18 && <1.24 , uniplate >=1.6.12 && <1.7 , split >=0.2.3.4 && <0.3 From 358f286714fd6394ea553cbd6b06a9bf0c27af88 Mon Sep 17 00:00:00 2001 From: NH002 Date: Sun, 15 Feb 2026 15:47:06 +0100 Subject: [PATCH 2/6] Lower the version of `deepseq` to the latest that can be used due to other dependencies --- hgettext.cabal | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hgettext.cabal b/hgettext.cabal index 9915923..cac2259 100644 --- a/hgettext.cabal +++ b/hgettext.cabal @@ -83,7 +83,7 @@ executable hgettext , containers , filepath - build-depends: deepseq >=1.1 && <1.7 + build-depends: deepseq >=1.1 && <1.6 , cpphs >=1.20.9.1 && <1.20.11 , haskell-src-exts >=1.18 && <1.24 , uniplate >=1.6.12 && <1.7 From 02e2f14e373c91e778cb557d4251408f1108a9be Mon Sep 17 00:00:00 2001 From: NH002 Date: Sun, 15 Feb 2026 16:53:01 +0100 Subject: [PATCH 3/6] Removed potentially unneeded dependencies --- hgettext.cabal | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/hgettext.cabal b/hgettext.cabal index cac2259..ee630c9 100644 --- a/hgettext.cabal +++ b/hgettext.cabal @@ -56,7 +56,6 @@ library hs-source-dirs: src build-depends: base >=4.5 && <4.23 , Cabal >=1.14 && <1.25 || >= 2.0 && < 2.5 || >=3.0 && <3.17 - , containers >=0.4.2 && <0.9 , directory >=1.1 && <1.4 , filepath >=1.3 && <1.6 , process >=1.1 && <1.7 @@ -77,13 +76,10 @@ executable hgettext hs-source-dirs: src-exe -- constraints inherited from lib:hgettext - build-depends: hgettext - , base - , Cabal - , containers - , filepath + build-depends: base - build-depends: deepseq >=1.1 && <1.6 + build-depends: containers >=0.4.2 && <0.9 + , deepseq >=1.1 && <1.6 , cpphs >=1.20.9.1 && <1.20.11 , haskell-src-exts >=1.18 && <1.24 , uniplate >=1.6.12 && <1.7 From 036e356e4468ece296d234a1db52331bf6e1891f Mon Sep 17 00:00:00 2001 From: NH002 Date: Sun, 15 Feb 2026 17:11:55 +0100 Subject: [PATCH 4/6] Added constraints to all dependencies --- hgettext.cabal | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/hgettext.cabal b/hgettext.cabal index ee630c9..e3402eb 100644 --- a/hgettext.cabal +++ b/hgettext.cabal @@ -75,10 +75,8 @@ executable hgettext hs-source-dirs: src-exe - -- constraints inherited from lib:hgettext - build-depends: base - - build-depends: containers >=0.4.2 && <0.9 + build-depends: base >=4.5 && <4.23 + , containers >=0.4.2 && <0.9 , deepseq >=1.1 && <1.6 , cpphs >=1.20.9.1 && <1.20.11 , haskell-src-exts >=1.18 && <1.24 From f544ba08a2838bb51e9bc9b07c3d0cad8e9748db Mon Sep 17 00:00:00 2001 From: NH002 Date: Sun, 15 Feb 2026 17:39:43 +0100 Subject: [PATCH 5/6] Remove testing GHC 9.10.1 --- hgettext.cabal | 1 - 1 file changed, 1 deletion(-) diff --git a/hgettext.cabal b/hgettext.cabal index e3402eb..75b3f54 100644 --- a/hgettext.cabal +++ b/hgettext.cabal @@ -22,7 +22,6 @@ tested-with: GHC == 9.14.1 GHC == 9.12.2 GHC == 9.10.3 - GHC == 9.10.1 GHC == 9.8.4 GHC == 9.6.6 GHC == 9.4.8 From 34cd3a4f9eb9c6cd0eeb46ca56549e64f2660781 Mon Sep 17 00:00:00 2001 From: NH002 Date: Sun, 15 Feb 2026 17:43:27 +0100 Subject: [PATCH 6/6] Regenerated CI workflow after removing GHC 9.10.1 --- .github/workflows/haskell-ci.yml | 5 ----- 1 file changed, 5 deletions(-) diff --git a/.github/workflows/haskell-ci.yml b/.github/workflows/haskell-ci.yml index fd3700b..8c72589 100644 --- a/.github/workflows/haskell-ci.yml +++ b/.github/workflows/haskell-ci.yml @@ -52,11 +52,6 @@ jobs: compilerVersion: 9.10.3 setup-method: ghcup allow-failure: false - - compiler: ghc-9.10.1 - compilerKind: ghc - compilerVersion: 9.10.1 - setup-method: ghcup - allow-failure: false - compiler: ghc-9.8.4 compilerKind: ghc compilerVersion: 9.8.4