diff --git a/.gitlab/ci.sh b/.gitlab/ci.sh index 469be94242f..2e653df1514 100755 --- a/.gitlab/ci.sh +++ b/.gitlab/ci.sh @@ -8,12 +8,14 @@ export GHCUP_INSTALL_BASE_PREFIX="$CI_PROJECT_DIR/toolchain" export CABAL_DIR="$CI_PROJECT_DIR/cabal" case "$(uname)" in - MSYS_*|MINGW*) - export CABAL_DIR="$(cygpath -w "$CABAL_DIR")" + MSYS_*|MINGW*) + export CABAL_DIR="$(cygpath -w "$CABAL_DIR")" GHCUP_BINDIR="${GHCUP_INSTALL_BASE_PREFIX}/ghcup/bin" - ;; + EXE_EXT=".exe" + ;; *) GHCUP_BINDIR="${GHCUP_INSTALL_BASE_PREFIX}/.ghcup/bin" + EXE_EXT="" ;; esac @@ -61,7 +63,7 @@ args=( run cabal v2-build ${args[@]} cabal-install mkdir "$CI_PROJECT_DIR/out" -cp "$(cabal list-bin ${args[@]} cabal-install:exe:cabal)" "$CI_PROJECT_DIR/out/cabal" +cp "$(cabal list-bin ${args[@]} cabal-install:exe:cabal)" "$CI_PROJECT_DIR/out/cabal$EXE_EXT" cp dist-newstyle/cache/plan.json "$CI_PROJECT_DIR/out/plan.json" cd "$CI_PROJECT_DIR/out/" @@ -69,10 +71,10 @@ cd "$CI_PROJECT_DIR/out/" TARBALL_PREFIX="cabal-install-$("$CI_PROJECT_DIR/out/cabal" --numeric-version)" case "${TARBALL_EXT}" in zip) - zip "${TARBALL_PREFIX}-${TARBALL_ARCHIVE_SUFFIX}.${TARBALL_EXT}" cabal plan.json + zip "${TARBALL_PREFIX}-${TARBALL_ARCHIVE_SUFFIX}.${TARBALL_EXT}" "cabal${EXE_EXT}" plan.json ;; tar.xz) - tar caf "${TARBALL_PREFIX}-${TARBALL_ARCHIVE_SUFFIX}.${TARBALL_EXT}" cabal plan.json + tar caf "${TARBALL_PREFIX}-${TARBALL_ARCHIVE_SUFFIX}.${TARBALL_EXT}" "cabal${EXE_EXT}" plan.json ;; *) fail "Unknown TARBALL_EXT: ${TARBALL_EXT}"