Skip to content

Commit 0bcbc6a

Browse files
committed
Fix gitlab CI
1 parent c85b612 commit 0bcbc6a

File tree

1 file changed

+5
-2
lines changed

1 file changed

+5
-2
lines changed

.gitlab/ci.sh

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,12 @@ export CABAL_DIR="$CI_PROJECT_DIR/cabal"
1111
case "$(uname)" in
1212
MSYS_*|MINGW*)
1313
export CABAL_DIR="$(cygpath -w "$CABAL_DIR")"
14-
GHCUP_BINDIR="${GHCUP_INSTALL_BASE_PREFIX}/ghcup/bin"
14+
GHCUP_DIR="${GHCUP_INSTALL_BASE_PREFIX}/ghcup"
15+
GHCUP_BINDIR="${GHCUP_DIR}/bin"
1516
;;
1617
*)
17-
GHCUP_BINDIR="${GHCUP_INSTALL_BASE_PREFIX}/.ghcup/bin"
18+
GHCUP_DIR="${GHCUP_INSTALL_BASE_PREFIX}/.ghcup"
19+
GHCUP_BINDIR="${GHCUP_DIR}/bin"
1820
;;
1921
esac
2022

@@ -29,6 +31,7 @@ export BOOTSTRAP_HASKELL_VERBOSE=1
2931
export BOOTSTRAP_HASKELL_ADJUST_CABAL_CONFIG=yes
3032

3133
curl --proto '=https' --tlsv1.2 -sSf https://get-ghcup.haskell.org | sh
34+
source "${GHCUP_DIR}"/env
3235

3336
# some alpines need workaround
3437
if ghc --info | grep -q integer-simple ; then

0 commit comments

Comments
 (0)