summaryrefslogtreecommitdiff
path: root/.gitlab
diff options
context:
space:
mode:
authorBen Gamari <ben@smart-cactus.org>2021-08-05 13:59:01 -0400
committerMarge Bot <ben+marge-bot@smart-cactus.org>2021-09-23 16:00:18 -0400
commitdae4a068d85e666d58e9ef0b06a06c5bfa38dd95 (patch)
tree2152be22ba2c9a38ba7794f97ccb53fb4b0f9196 /.gitlab
parent68509e1c7dc80b9d0b2ebea6340cd349c6424a77 (diff)
downloadhaskell-dae4a068d85e666d58e9ef0b06a06c5bfa38dd95.tar.gz
gitlab-ci: Ensure that CABAL_DIR is a Windows path
Otherwise cabal-install falls over.
Diffstat (limited to '.gitlab')
-rwxr-xr-x.gitlab/ci.sh10
1 files changed, 8 insertions, 2 deletions
diff --git a/.gitlab/ci.sh b/.gitlab/ci.sh
index 18e63b33bd..c8877973c9 100755
--- a/.gitlab/ci.sh
+++ b/.gitlab/ci.sh
@@ -560,8 +560,14 @@ else
fi
case "$(uname)" in
- MSYS_*|MINGW*) exe=".exe" ;;
- *) exe="" ;;
+ MSYS_*|MINGW*)
+ exe=".exe"
+ # N.B. cabal-install expects CABAL_DIR to be a Windows path
+ CABAL_DIR="$(cygpath -w "$CABAL_DIR")"
+ ;;
+ *)
+ exe=""
+ ;;
esac
MAKE="make"