From 9ebb937b3749cacc9223ffe694dcc64b2fabf033 Mon Sep 17 00:00:00 2001 From: Julian Ospald Date: Wed, 3 Jan 2024 21:16:10 +0800 Subject: [PATCH] Test that building hashable works --- .github/scripts/env.sh | 2 +- .github/workflows/install-bindist.sh | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/scripts/env.sh b/.github/scripts/env.sh index e5bafd9..cf7b712 100644 --- a/.github/scripts/env.sh +++ b/.github/scripts/env.sh @@ -12,7 +12,7 @@ fi export PATH="$HOME/.local/bin:$PATH" export BOOTSTRAP_HASKELL_NONINTERACTIVE=1 -export BOOTSTRAP_HASKELL_CABAL_VERSION="${CABAL_VER:-3.6.2.0}" +export BOOTSTRAP_HASKELL_CABAL_VERSION="${CABAL_VER:-3.6.2.0-p2}" export BOOTSTRAP_HASKELL_ADJUST_CABAL_CONFIG=no export BOOTSTRAP_HASKELL_INSTALL_NO_STACK=yes export BOOTSTRAP_HASKELL_ADJUST_BASHRC=1 diff --git a/.github/workflows/install-bindist.sh b/.github/workflows/install-bindist.sh index 5732482..785478a 100755 --- a/.github/workflows/install-bindist.sh +++ b/.github/workflows/install-bindist.sh @@ -109,6 +109,8 @@ case $TOOL in cabal --version cabal update cabal install --lib --package-env=. clock + # https://github.com/haskell/ghcup-hs/issues/966 + cabal install --lib --package-env=. hashable ;; cabal) ghcup_fun install ghc --set "$(ghcup_fun list -t ghc -r -c available | tail -1 | awk '{ print $2 }')"