diff --git a/.github/scripts/bootstrap.sh b/.github/scripts/bootstrap.sh index 7a2c14f..5f805e5 100644 --- a/.github/scripts/bootstrap.sh +++ b/.github/scripts/bootstrap.sh @@ -13,4 +13,6 @@ git describe --always ./scripts/bootstrap/bootstrap-haskell [ "$(ghc --numeric-version)" = "${BOOTSTRAP_HASKELL_GHC_VERSION}" ] +# https://github.com/actions/runner-images/issues/7061 +[ "$(ghcup config | grep --color=never meta-mode)" = "meta-mode: Lax" ] diff --git a/scripts/bootstrap/bootstrap-haskell b/scripts/bootstrap/bootstrap-haskell index fa8450d..df9ec4f 100755 --- a/scripts/bootstrap/bootstrap-haskell +++ b/scripts/bootstrap/bootstrap-haskell @@ -119,6 +119,10 @@ edo() { "$@" || die "\"$*\" failed!" } +eghcup_raw() { + "${GHCUP_BIN}/ghcup" "$@" || die "\"ghcup $*\" failed!" +} + eghcup() { _eghcup "$@" } @@ -381,10 +385,10 @@ download_ghcup() { edo . "${GHCUP_DIR}"/env case "${BOOTSTRAP_HASKELL_DOWNLOADER}" in "curl") - eghcup config set downloader Curl + eghcup_raw config set downloader Curl ;; "wget") - eghcup config set downloader Wget + eghcup_raw config set downloader Wget ;; *) die "Unknown downloader: ${BOOTSTRAP_HASKELL_DOWNLOADER}"