From 7e7c357e47b4eafe631c383e2a78e32bdc691b7c Mon Sep 17 00:00:00 2001 From: Julian Ospald Date: Sun, 12 Jul 2020 21:39:08 +0200 Subject: [PATCH] Fix freebsd CI --- .gitlab/before_script/freebsd/install_deps.sh | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) diff --git a/.gitlab/before_script/freebsd/install_deps.sh b/.gitlab/before_script/freebsd/install_deps.sh index 1d8c6b0..d628f3f 100755 --- a/.gitlab/before_script/freebsd/install_deps.sh +++ b/.gitlab/before_script/freebsd/install_deps.sh @@ -11,15 +11,8 @@ mkdir -p "${TMPDIR}" curl -sSfL https://downloads.haskell.org/~ghcup/x86_64-portbld-freebsd-ghcup > ./ghcup-bin chmod +x ghcup-bin -mkdir -p "${GHCUP_INSTALL_BASE_PREFIX}"/.ghcup/bin -# ./ghcup-bin install ${GHC_VERSION} -# ./ghcup-bin install-cabal ${CABAL_VERSION} -# ./ghcup-bin set ${GHC_VERSION} - -# install cabal-3.2.0.0 -curl -sSfL -o cabal-install-3.2.0.0-x86_64-portbld-freebsd.tar.xz 'https://hasufell.de/d/d3e215db133e4fcaa61e/files/?p=/cabal-install-3.2.0.0-x86_64-portbld-freebsd.tar.xz&dl=1' -tar xf cabal-install-3.2.0.0-x86_64-portbld-freebsd.tar.xz -cp cabal "${GHCUP_INSTALL_BASE_PREFIX}/.ghcup/bin/cabal" -chmod +x "${GHCUP_INSTALL_BASE_PREFIX}/.ghcup/bin/cabal" +./ghcup-bin install ${GHC_VERSION} +./ghcup-bin install-cabal ${CABAL_VERSION} +./ghcup-bin set ${GHC_VERSION} exit 0