From 38c627883ac4ca1d54d0f32b16c9b534056a2fe0 Mon Sep 17 00:00:00 2001
From: Andre Anjos <andre.dos.anjos@gmail.com>
Date: Thu, 10 Jan 2019 15:03:42 +0100
Subject: [PATCH] [ci] Try a bootstrap fix
---
ci/bootstrap.sh | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/ci/bootstrap.sh b/ci/bootstrap.sh
index ce6989ee..c9309260 100755
--- a/ci/bootstrap.sh
+++ b/ci/bootstrap.sh
@@ -67,9 +67,6 @@ merge_conda_cache() {
if [ -d ${2}/conda-bld ]; then
log_info "Moving conda-bld packages (artifacts)..."
run_cmd mv ${2}/conda-bld ${1}
- run_cmd ${CONDA_ROOT}/bin/conda index --verbose ${1}/conda-bld
- run_cmd ls -l ${1}/conda-bld
- run_cmd ls -l ${1}/conda-bld/noarch/
fi
fi
}
@@ -140,6 +137,9 @@ CONDA_CLI_CHANNELS="-c ${CONDA_CHANNEL_ROOT} -c defaults"
if [ "${1}" == "build" ]; then
run_cmd ${CONDA_ROOT}/bin/conda install -n base python conda=4 conda-build=3
elif [ "${1}" == "local" ]; then
+ # updates the base installation, installs conda-build
+ run_cmd ls -l ${CONDA_ROOT}/conda-bld
+ run_cmd ${CONDA_ROOT}/bin/conda install -n base python conda=4 conda-build=3
CONDA_CLI_CHANNELS="-c ${CONDA_ROOT}/conda-bld ${CONDA_CLI_CHANNELS}"
run_cmd ls -l ${CONDA_ROOT}/conda-bld
run_cmd ls -l ${CONDA_ROOT}/conda-bld/noarch/
--
GitLab