From ce148d69169874608fe46ff784d601f5e4464d8b Mon Sep 17 00:00:00 2001 From: Oleg Grenrus Date: Tue, 8 Jul 2025 17:48:32 +0300 Subject: [PATCH] Allow QuickCheck-2.16 --- .github/workflows/haskell-ci.yml | 18 +++++++++--------- cabal.haskell-ci | 1 + tree-diff.cabal | 6 +++--- 3 files changed, 13 insertions(+), 12 deletions(-) diff --git a/.github/workflows/haskell-ci.yml b/.github/workflows/haskell-ci.yml index 8943036..133f7a5 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.20250708 # -# REGENDATA ("0.19.20250330",["github","cabal.project"]) +# REGENDATA ("0.19.20250708",["github","cabal.project"]) # name: Haskell-CI on: @@ -37,9 +37,9 @@ jobs: compilerVersion: 9.12.2 setup-method: ghcup allow-failure: false - - compiler: ghc-9.10.1 + - compiler: ghc-9.10.2 compilerKind: ghc - compilerVersion: 9.10.1 + compilerVersion: 9.10.2 setup-method: ghcup allow-failure: false - compiler: ghc-9.8.4 @@ -95,8 +95,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.14.2.0 || (cat "$HOME"/.ghcup/logs/*.* && false) + echo "CABAL=$HOME/.ghcup/bin/cabal-3.14.2.0 -vnormal+nowrap" >> "$GITHUB_ENV" - name: Install GHC (GHCup) if: matrix.setup-method == 'ghcup' run: | @@ -174,8 +174,8 @@ jobs: - name: install cabal-docspec run: | mkdir -p $HOME/.cabal/bin - curl -sL https://github.com/phadej/cabal-extras/releases/download/cabal-docspec-0.0.0.20240703/cabal-docspec-0.0.0.20240703-x86_64-linux.xz > cabal-docspec.xz - echo '48bf3b7fd2f7f0caa6162afee57a755be8523e7f467b694900eb420f5f9a7b76 cabal-docspec.xz' | sha256sum -c - + curl -sL https://github.com/phadej/cabal-extras/releases/download/cabal-docspec-0.0.0.20250606/cabal-docspec-0.0.0.20250606-x86_64-linux.xz > cabal-docspec.xz + echo 'cc20bb5c19501b42bde77556bc419c7c0a5c8d1eb65663024d8a4e4c868bef25 cabal-docspec.xz' | sha256sum -c - xz -d < cabal-docspec.xz > $HOME/.cabal/bin/cabal-docspec rm -f cabal-docspec.xz chmod a+x $HOME/.cabal/bin/cabal-docspec @@ -206,7 +206,7 @@ jobs: touch cabal.project.local echo "packages: ${PKGDIR_tree_diff}" >> cabal.project echo "package tree-diff" >> cabal.project - echo " ghc-options: -Werror=missing-methods" >> cabal.project + echo " ghc-options: -Werror=missing-methods -Werror=missing-fields" >> cabal.project cat >> cabal.project <> cabal.project.local diff --git a/cabal.haskell-ci b/cabal.haskell-ci index 4f3666d..307092d 100644 --- a/cabal.haskell-ci +++ b/cabal.haskell-ci @@ -2,6 +2,7 @@ branches: master tests: >=7.6 haddock: >=7.8 docspec: >=8 +error-unused-packages: False -- We would like to have this. But it just doesn't work with GHCJS -- constraint-set bytestring-0.11 diff --git a/tree-diff.cabal b/tree-diff.cabal index f653e74..9f5ec6a 100644 --- a/tree-diff.cabal +++ b/tree-diff.cabal @@ -1,7 +1,7 @@ cabal-version: 2.2 name: tree-diff version: 0.3.4 -x-revision: 1 +x-revision: 2 synopsis: Diffing of (expression) trees. category: Data, Testing description: @@ -53,7 +53,7 @@ tested-with: || ==9.4.8 || ==9.6.7 || ==9.8.4 - || ==9.10.1 + || ==9.10.2 || ==9.12.2 extra-source-files: @@ -98,7 +98,7 @@ library , hashable ^>=1.4.4.0 || ^>=1.5.0.0 , parsers ^>=0.12.11 , primitive ^>=0.9.0.0 - , QuickCheck ^>=2.14.2 || ^>=2.15 + , QuickCheck ^>=2.14.2 || ^>=2.15 || ^>=2.16.0.0 , scientific ^>=0.3.8.0 , semialign ^>=1.3.1 , strict ^>=0.5