From 938c0bb17e4d4507b51aeb034f17d277a1f09ed1 Mon Sep 17 00:00:00 2001
From: Andre Anjos <andre.dos.anjos@gmail.com>
Date: Thu, 10 Jan 2019 12:44:47 +0100
Subject: [PATCH] [ci] Fix conda merge procedure
---
ci/bootstrap.sh | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/ci/bootstrap.sh b/ci/bootstrap.sh
index 56e1304c..106e490c 100755
--- a/ci/bootstrap.sh
+++ b/ci/bootstrap.sh
@@ -55,15 +55,15 @@ merge_conda_cache() {
if [ -e ${1} ]; then
_cached_urlstxt="${2}/urls.txt"
_urlstxt="${1}/urls.txt"
- if [ -e ${2} ]; then
+ if [ -e ${2}/pkgs ]; then
log_info "Merging urls.txt and packages with cached files..."
mv ${2}/pkgs/*.tar.bz2 ${1}/pkgs
cat ${_urlstxt} ${_cached_urlstxt} | sort | uniq > ${_urlstxt}
- if [ -d ${2}/conda-bld ]; then
- log_info "Moving conda-bld packages (artifacts)..."
- run_cmd mv ${2}/conda-bld ${1}
- run_cmd conda index ${1}/conda-bld
- fi
+ fi
+ if [ -d ${2}/conda-bld ]; then
+ log_info "Moving conda-bld packages (artifacts)..."
+ run_cmd mv ${2}/conda-bld ${1}
+ run_cmd conda index ${1}/conda-bld
fi
fi
}
--
GitLab