diff --git a/.github/workflows/haskell-ci.yml b/.github/workflows/haskell-ci.yml index ba180b1..db3ea45 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" diff --git a/binary-instances.cabal b/binary-instances.cabal index cabd6ae..ec146ef 100644 --- a/binary-instances.cabal +++ b/binary-instances.cabal @@ -1,6 +1,7 @@ cabal-version: 2.2 name: binary-instances version: 1.0.5 +x-revision: 1 synopsis: Orphan instances for binary description: `binary-instances` defines orphan instances for types in some popular packages. @@ -45,7 +46,7 @@ library build-depends: , aeson ^>=2.2.2.0 , binary-orphans ^>=1.0.5 - , hashable ^>=1.4.4.0 + , hashable ^>=1.4.4.0 || ^>=1.5.0.0 , primitive ^>=0.9.0.0 , scientific ^>=0.3.8.0 , time-compat ^>=1.9.7 @@ -86,7 +87,7 @@ test-suite binary-instances-test , scientific , tagged , tasty ^>=1.5 - , tasty-quickcheck ^>=0.10.3 + , tasty-quickcheck ^>=0.10.3 || ^>=0.11 , text , time-compat , unordered-containers