From fd56a3d72832f1c9f7c8dd38f1ee10cce57009e8 Mon Sep 17 00:00:00 2001 From: Erik de Castro Lopo Date: Mon, 9 Feb 2026 08:58:56 +1100 Subject: [PATCH 1/2] Update dependencies --- base64-bytestring-type.cabal | 7 ++++--- cabal.project | 29 +++-------------------------- 2 files changed, 7 insertions(+), 29 deletions(-) diff --git a/base64-bytestring-type.cabal b/base64-bytestring-type.cabal index 1371654..e2f251f 100644 --- a/base64-bytestring-type.cabal +++ b/base64-bytestring-type.cabal @@ -29,8 +29,9 @@ tested-with: || ==9.4.8 || ==9.6.7 || ==9.8.4 - || ==9.10.2 + || ==9.10.3 || ==9.12.2 + || ==9.14.1 extra-source-files: README.md @@ -73,7 +74,7 @@ library -- other dependencies: build-depends: aeson >=1.2.3.0 && <1.6 || >=2.0 && <2.3 - , base-compat >=0.9.3 && <0.15 + , base-compat >=0.9.3 && <0.16 , base64-bytestring >=1.0.0.1 && <1.3 , hashable >=1.2.6.1 && <1.6 , QuickCheck >=2.11.3 && <2.17 @@ -88,7 +89,7 @@ library build-depends: serialise >=0.2.1.0 && <0.3 if flag(http-api-data) - build-depends: http-api-data >=0.4 && <0.7 + build-depends: http-api-data >=0.4 && <0.8 exposed-modules: Data.ByteString.Base64.Lazy.Type diff --git a/cabal.project b/cabal.project index 0bac6fe..084cf31 100644 --- a/cabal.project +++ b/cabal.project @@ -1,46 +1,23 @@ packages: . +-- cabal-allow-newer if impl (ghc >= 9.14) allow-newer: , aeson:containers , aeson:template-haskell - , assoc:base - , bifunctors:template-haskell , cborg:base , cborg:containers - , data-fix:base - , generically:base - , hashable:base - , hashable:containers - , hashable:ghc-bignum , http-api-data:base , http-api-data:containers + , http-api-data:time-compat + , http-api-data:uuid-types , indexed-traversable:base , indexed-traversable:containers , indexed-traversable-instances:base - , integer-conversion:base - , integer-logarithms:base - , integer-logarithms:ghc-bignum - , OneTuple:base - , primitive:base - , scientific:base - , scientific:containers - , scientific:template-haskell , semialign:base , semialign:containers , serialise:base , serialise:containers - , splitmix:base - , tagged:template-haskell - , text:base - , text-short:base - , text-short:template-haskell - , th-abstraction:template-haskell - , th-compat:template-haskell , these:base , time-compat:base - , unordered-containers:template-haskell , uuid-types:template-haskell - , vector:base - , vector-stream:base - , witherable:containers From b7b1355700a12b30b081d64b88127ac8d74fa3c0 Mon Sep 17 00:00:00 2001 From: Erik de Castro Lopo Date: Mon, 9 Feb 2026 09:02:34 +1100 Subject: [PATCH 2/2] CI: Regerate spec Had to add `allow-newer: *:*` for `ghc-9.14`. This hack will be dropped in the future. --- .github/workflows/haskell-ci.yml | 29 +++++++++++++++++++++-------- 1 file changed, 21 insertions(+), 8 deletions(-) diff --git a/.github/workflows/haskell-ci.yml b/.github/workflows/haskell-ci.yml index 7aefe68..1a55c39 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.20260104 # -# REGENDATA ("0.19.20250605",["github","cabal.project"]) +# REGENDATA ("0.19.20260104",["github","cabal.project"]) # 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.2 + - compiler: ghc-9.10.3 compilerKind: ghc - compilerVersion: 9.10.2 + 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.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: | @@ -202,7 +210,7 @@ jobs: key: ${{ runner.os }}-${{ matrix.compiler }}-tools-72b17435 path: ~/.haskell-ci-tools - name: checkout - uses: actions/checkout@v4 + uses: actions/checkout@v5 with: path: source - name: initial cabal.project for sdist @@ -227,7 +235,12 @@ jobs: touch cabal.project.local echo "packages: ${PKGDIR_base64_bytestring_type}" >> cabal.project if [ $((HCNUMVER >= 80200)) -ne 0 ] ; then echo "package base64-bytestring-type" >> 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 base64-bytestring-type" >> 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 base64-bytestring-type" >> cabal.project ; fi + if [ $((HCNUMVER >= 90000)) -ne 0 ] ; then echo " ghc-options: -Werror=incomplete-patterns -Werror=incomplete-uni-patterns" >> cabal.project ; fi + if [ $((HCNUMVER >= 91400)) -ne 0 ] ; then echo "allow-newer: *:*" >> cabal.project ; fi cat >> cabal.project <> cabal.project.local