From b1c5e84b429733bd972cafb9e63c8b4f1834b7e1 Mon Sep 17 00:00:00 2001 From: Julian Ospald Date: Fri, 24 Feb 2023 20:02:07 +0800 Subject: [PATCH] Fix ghcup-bindist for installing ghcup --- .github/workflows/install-bindist.sh | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/.github/workflows/install-bindist.sh b/.github/workflows/install-bindist.sh index 8b0c66b..b99af28 100755 --- a/.github/workflows/install-bindist.sh +++ b/.github/workflows/install-bindist.sh @@ -13,7 +13,13 @@ source "$GHCUP_INSTALL_BASE_PREFIX"/.ghcup/env || source "$HOME/.bashrc" ghcup --version which ghcup | grep foobarbaz -ghcup -v --url-source=file:$METADATA_FILE install $TOOL --set $VERSION +case $TOOL in + ghcup) + ghcup -v --url-source=file:$METADATA_FILE upgrade --force + ;; + *) ghcup -v --url-source=file:$METADATA_FILE install $TOOL --set $VERSION + ;; +esac mkdir -p /tmp/install-bindist-ci cd /tmp/install-bindist-ci @@ -27,6 +33,9 @@ main = print $ 1 + 1 EOF case $TOOL in + ghcup) + ghcup --verbose list + ;; hls) ghcup install cabal latest ghcup install ghc --set recommended