From 4b338ccfd8ab49692e3c1d47f15a4123d1cf40b0 Mon Sep 17 00:00:00 2001 From: Julian Ospald Date: Sun, 21 Jan 2024 15:29:12 +0800 Subject: [PATCH] Fix windows ghcup test script --- .github/scripts/common.sh | 2 +- .github/scripts/test.sh | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/scripts/common.sh b/.github/scripts/common.sh index 262c09b..3006776 100644 --- a/.github/scripts/common.sh +++ b/.github/scripts/common.sh @@ -44,7 +44,7 @@ raw_eghcup() { eghcup() { if [ "${OS}" = "Windows" ] ; then - "$GHCUP_BIN/ghcup${ext}" -c -s "file:/$CI_PROJECT_DIR/data/metadata/ghcup-${JSON_VERSION}.yaml" "$@" + "$GHCUP_BIN/ghcup${ext}" -c -s "file:${GITHUB_WORKSPACE//\\//}/data/metadata/ghcup-${JSON_VERSION}.yaml" "$@" else "$GHCUP_BIN/ghcup${ext}" -c -s "file://$CI_PROJECT_DIR/data/metadata/ghcup-${JSON_VERSION}.yaml" "$@" fi diff --git a/.github/scripts/test.sh b/.github/scripts/test.sh index 331c1c3..ce5ae26 100644 --- a/.github/scripts/test.sh +++ b/.github/scripts/test.sh @@ -11,6 +11,7 @@ else GHCUP_DIR="${GHCUP_INSTALL_BASE_PREFIX}"/.ghcup fi +env git_describe rm -rf "${GHCUP_DIR}"