From bef92ef627a4a3f2b01f996e02fdf252a1027781 Mon Sep 17 00:00:00 2001 From: Oleg Grenrus Date: Fri, 2 Aug 2024 19:00:40 +0300 Subject: [PATCH] Allow hashable-1.5 --- .github/workflows/haskell-ci.yml | 14 +++++++------- tree-diff.cabal | 5 +++-- 2 files changed, 10 insertions(+), 9 deletions(-) diff --git a/.github/workflows/haskell-ci.yml b/.github/workflows/haskell-ci.yml index 5f8ba92..2126387 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.20240514 +# version: 0.19.20240708 # -# REGENDATA ("0.19.20240514",["github","cabal.project"]) +# REGENDATA ("0.19.20240708",["github","cabal.project"]) # name: Haskell-CI on: @@ -84,10 +84,10 @@ jobs: apt-get update apt-get install -y --no-install-recommends gnupg ca-certificates dirmngr curl git software-properties-common libtinfo5 mkdir -p "$HOME/.ghcup/bin" - curl -sL https://downloads.haskell.org/ghcup/0.1.20.0/x86_64-linux-ghcup-0.1.20.0 > "$HOME/.ghcup/bin/ghcup" + curl -sL https://downloads.haskell.org/ghcup/0.1.30.0/x86_64-linux-ghcup-0.1.30.0 > "$HOME/.ghcup/bin/ghcup" chmod a+x "$HOME/.ghcup/bin/ghcup" "$HOME/.ghcup/bin/ghcup" install ghc "$HCVER" || (cat "$HOME"/.ghcup/logs/*.* && false) - "$HOME/.ghcup/bin/ghcup" install cabal 3.10.2.0 || (cat "$HOME"/.ghcup/logs/*.* && false) + "$HOME/.ghcup/bin/ghcup" install cabal 3.12.1.0 || (cat "$HOME"/.ghcup/logs/*.* && false) env: HCKIND: ${{ matrix.compilerKind }} HCNAME: ${{ matrix.compiler }} @@ -105,7 +105,7 @@ jobs: echo "HC=$HC" >> "$GITHUB_ENV" echo "HCPKG=$HCPKG" >> "$GITHUB_ENV" echo "HADDOCK=$HADDOCK" >> "$GITHUB_ENV" - echo "CABAL=$HOME/.ghcup/bin/cabal-3.10.2.0 -vnormal+nowrap" >> "$GITHUB_ENV" + echo "CABAL=$HOME/.ghcup/bin/cabal-3.12.1.0 -vnormal+nowrap" >> "$GITHUB_ENV" HCNUMVER=$(${HC} --numeric-version|perl -ne '/^(\d+)\.(\d+)\.(\d+)(\.(\d+))?$/; print(10000 * $1 + 100 * $2 + ($3 == 0 ? $5 != 1 : $3))') echo "HCNUMVER=$HCNUMVER" >> "$GITHUB_ENV" echo "ARG_TESTS=--enable-tests" >> "$GITHUB_ENV" @@ -164,8 +164,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.20240414/cabal-docspec-0.0.0.20240414-x86_64-linux.xz > cabal-docspec.xz - echo '2d18a3f79619e8ec5f11870f926f6dc2616e02a6c889315b7f82044b95a1adb9 cabal-docspec.xz' | sha256sum -c - + 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 - xz -d < cabal-docspec.xz > $HOME/.cabal/bin/cabal-docspec rm -f cabal-docspec.xz chmod a+x $HOME/.cabal/bin/cabal-docspec diff --git a/tree-diff.cabal b/tree-diff.cabal index 4085d23..e1986a7 100644 --- a/tree-diff.cabal +++ b/tree-diff.cabal @@ -1,6 +1,7 @@ cabal-version: 2.2 name: tree-diff version: 0.3.1 +x-revision: 1 synopsis: Diffing of (expression) trees. category: Data, Testing description: @@ -93,7 +94,7 @@ library , aeson ^>=2.2.0.0 , ansi-terminal ^>=1.1 , ansi-wl-pprint ^>=1.0.2 - , hashable ^>=1.4.4.0 + , hashable ^>=1.4.4.0 || ^>=1.5.0.0 , parsers ^>=0.12.11 , primitive ^>=0.9.0.0 , QuickCheck ^>=2.14.2 || ^>=2.15 @@ -152,7 +153,7 @@ test-suite tree-diff-test build-depends: , tasty ^>=1.5 , tasty-golden ^>=2.3.5 - , tasty-quickcheck ^>=0.10.3 + , tasty-quickcheck ^>=0.10.3 || ^>=0.11 , trifecta ^>=2.1.4 benchmark tree-diff-bench