From b9809328e8257f35177b33ab71f8e5a990ff265f Mon Sep 17 00:00:00 2001 From: Julian Ospald Date: Sat, 30 Mar 2024 14:24:45 +0800 Subject: [PATCH] Make sure GHC prerelease pipeline works --- .github/workflows/install-bindist.sh | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/.github/workflows/install-bindist.sh b/.github/workflows/install-bindist.sh index 2268ea3..a6c3f1f 100755 --- a/.github/workflows/install-bindist.sh +++ b/.github/workflows/install-bindist.sh @@ -111,12 +111,21 @@ case $TOOL in ghc --info ghc -prof main.hs [[ $(./main +RTS -s) -eq 2 ]] - ghcup_fun install cabal recommended + ghcup install cabal recommended cabal --version cabal update - cabal install --lib --package-env=. clock - # https://github.com/haskell/ghcup-hs/issues/966 - cabal install --lib --package-env=. hashable + case "${CHANNEL}" in + Prerelease|prereleasee) + cabal install --lib --package-env=. --allow-newer clock + # https://github.com/haskell/ghcup-hs/issues/966 + cabal install --lib --package-env=. --allow-newer --constraint='filepath <1.5' hashable + ;; + *) + cabal install --lib --package-env=. clock + # https://github.com/haskell/ghcup-hs/issues/966 + cabal install --lib --package-env=. hashable + ;; + esac case "$(uname -s)" in MSYS_*|MINGW*) ;;