Skip to content

Commit 49a4946

Browse files
jneirarobxmergify[bot]
authored
Fix win release ext (#8191)
* Fix cabal exec extension for win * Use tabs in the changed region * Use exe ext when zipping * Apply suggestions from code review Co-authored-by: Robert <[email protected]> * Add curly braces to var Co-authored-by: Robert <[email protected]> Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
1 parent 45b2c34 commit 49a4946

File tree

1 file changed

+8
-6
lines changed

1 file changed

+8
-6
lines changed

.gitlab/ci.sh

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,14 @@ export GHCUP_INSTALL_BASE_PREFIX="$CI_PROJECT_DIR/toolchain"
88
export CABAL_DIR="$CI_PROJECT_DIR/cabal"
99

1010
case "$(uname)" in
11-
MSYS_*|MINGW*)
12-
export CABAL_DIR="$(cygpath -w "$CABAL_DIR")"
11+
MSYS_*|MINGW*)
12+
export CABAL_DIR="$(cygpath -w "$CABAL_DIR")"
1313
GHCUP_BINDIR="${GHCUP_INSTALL_BASE_PREFIX}/ghcup/bin"
14-
;;
14+
EXE_EXT=".exe"
15+
;;
1516
*)
1617
GHCUP_BINDIR="${GHCUP_INSTALL_BASE_PREFIX}/.ghcup/bin"
18+
EXE_EXT=""
1719
;;
1820
esac
1921

@@ -61,18 +63,18 @@ args=(
6163
run cabal v2-build ${args[@]} cabal-install
6264

6365
mkdir "$CI_PROJECT_DIR/out"
64-
cp "$(cabal list-bin ${args[@]} cabal-install:exe:cabal)" "$CI_PROJECT_DIR/out/cabal"
66+
cp "$(cabal list-bin ${args[@]} cabal-install:exe:cabal)" "$CI_PROJECT_DIR/out/cabal$EXE_EXT"
6567
cp dist-newstyle/cache/plan.json "$CI_PROJECT_DIR/out/plan.json"
6668
cd "$CI_PROJECT_DIR/out/"
6769

6870
# create tarball/zip
6971
TARBALL_PREFIX="cabal-install-$("$CI_PROJECT_DIR/out/cabal" --numeric-version)"
7072
case "${TARBALL_EXT}" in
7173
zip)
72-
zip "${TARBALL_PREFIX}-${TARBALL_ARCHIVE_SUFFIX}.${TARBALL_EXT}" cabal plan.json
74+
zip "${TARBALL_PREFIX}-${TARBALL_ARCHIVE_SUFFIX}.${TARBALL_EXT}" "cabal${EXE_EXT}" plan.json
7375
;;
7476
tar.xz)
75-
tar caf "${TARBALL_PREFIX}-${TARBALL_ARCHIVE_SUFFIX}.${TARBALL_EXT}" cabal plan.json
77+
tar caf "${TARBALL_PREFIX}-${TARBALL_ARCHIVE_SUFFIX}.${TARBALL_EXT}" "cabal${EXE_EXT}" plan.json
7678
;;
7779
*)
7880
fail "Unknown TARBALL_EXT: ${TARBALL_EXT}"

0 commit comments

Comments
 (0)