From 03bac93929b5513838a7306222f4e54ba975be6f Mon Sep 17 00:00:00 2001 From: Julian Ospald Date: Tue, 29 Sep 2020 10:57:21 +0200 Subject: [PATCH] Improve bootstrap test --- .gitlab-ci.yml | 2 +- .gitlab/before_script/linux/install_deps_minimal.sh | 10 ++++++++++ .gitlab/script/ghcup_bootstrap.sh | 2 ++ 3 files changed, 13 insertions(+), 1 deletion(-) create mode 100755 .gitlab/before_script/linux/install_deps_minimal.sh diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index a74e103..4a4a8b9 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -106,7 +106,7 @@ variables: test:linux:bootstrap_script: before_script: - - ./.gitlab/before_script/linux/install_deps.sh + - ./.gitlab/before_script/linux/install_deps_minimal.sh script: - ./.gitlab/script/ghcup_bootstrap.sh variables: diff --git a/.gitlab/before_script/linux/install_deps_minimal.sh b/.gitlab/before_script/linux/install_deps_minimal.sh new file mode 100755 index 0000000..5dcff27 --- /dev/null +++ b/.gitlab/before_script/linux/install_deps_minimal.sh @@ -0,0 +1,10 @@ +#!/bin/sh + +set -eux + +. "$( cd "$(dirname "$0")" ; pwd -P )/../../ghcup_env" + +mkdir -p "${TMPDIR}" + +sudo apt-get update -y +sudo apt-get install -y libnuma-dev zlib1g-dev libgmp-dev libgmp10 libssl-dev liblzma-dev git wget diff --git a/.gitlab/script/ghcup_bootstrap.sh b/.gitlab/script/ghcup_bootstrap.sh index 7ee3d46..a7ceb75 100755 --- a/.gitlab/script/ghcup_bootstrap.sh +++ b/.gitlab/script/ghcup_bootstrap.sh @@ -26,3 +26,5 @@ export BOOTSTRAP_HASKELL_CABAL_VERSION=$CABAL_VERSION ./bootstrap-haskell +[ "$(ghc --numeric-version)" = "${GHC_VERSION}" ] +