From 8d7d17b7acd8cddee1c86ee15a36e0b1d9f2a3c3 Mon Sep 17 00:00:00 2001 From: Andre Anjos <andre.dos.anjos@gmail.com> Date: Thu, 10 Jan 2019 09:25:03 +0100 Subject: [PATCH] [ci] Better reporting --- ci/bootstrap.sh | 14 ++++---------- ci/build.sh | 20 +++++++------------- 2 files changed, 11 insertions(+), 23 deletions(-) diff --git a/ci/bootstrap.sh b/ci/bootstrap.sh index ee4611cc..d4f37106 100755 --- a/ci/bootstrap.sh +++ b/ci/bootstrap.sh @@ -56,6 +56,7 @@ check_defined() { log_error "Variable ${1} is zero-length - aborting..."; exit 1 fi + log_info "${1}=${!1}" } @@ -97,18 +98,11 @@ install_miniconda() { } -# Exports a given environment variable, verbosely -export_env() { - check_defined "${1}" - export ${1} - log_info "export ${1}=${!1}" -} - check_defined CONDA_ROOT check_defined CI_PROJECT_DIR -CONDARC=${CONDA_ROOT}/condarc -export_env CONDARC +export CONDARC=${CONDA_ROOT}/condarc +check_defined CONDARC # checks if a conda installation exists. Otherwise, installs one if [ ! -e ${CONDA_ROOT}/bin/conda ]; then @@ -119,7 +113,7 @@ run_cmd mkdir -p ${CONDA_ROOT}/pkgs run_cmd touch ${CONDA_ROOT}/pkgs/urls run_cmd touch ${CONDA_ROOT}/pkgs/urls.txt -cp -fv ${CI_PROJECT_DIR}/bob/devtools/data/base-condarc ${CONDARC} +run_cmd cp -fv ${CI_PROJECT_DIR}/bob/devtools/data/base-condarc ${CONDARC} echo "channels:" >> ${CONDARC} echo " - http://www.idiap.ch/public/conda" >> ${CONDARC} echo " - defaults" >> ${CONDARC} diff --git a/ci/build.sh b/ci/build.sh index 010a1050..e4d32458 100755 --- a/ci/build.sh +++ b/ci/build.sh @@ -25,32 +25,26 @@ check_defined() { log_error "Variable ${1} is zero-length - aborting..."; exit 1 fi + log_info "${1}=${!1}" } -# Exports a given environment variable, verbosely -export_env() { - check_defined "${1}" - export ${1} - log_info "export ${1}=${!1}" -} - check_defined CONDA_ROOT check_defined CI_PROJECT_DIR check_defined CI_PROJECT_NAME -check_defined CI_COMMIT_TAG check_defined PYTHON_VERSION -CONDARC=${CONDA_ROOT}/condarc -export_env CONDARC +export CONDARC=${CONDA_ROOT}/condarc +check_defined CONDARC -BOB_PACKAGE_VERSION=`cat version.txt | tr -d '\n'`; -export_env BOB_PACKAGE_VERSION +export BOB_PACKAGE_VERSION=`cat version.txt | tr -d '\n'`; +check_defined BOB_PACKAGE_VERSION # Makes sure we activate the base environment if available run_cmd source ${CONDA_ROOT}/etc/profile.d/conda.sh run_cmd conda activate base -export_env PATH +export PATH +check_defined PATH if [ -z "${CI_COMMIT_TAG}" ]; then #building beta channel="http://www.idiap.ch/public/conda/label/beta" -- GitLab