From 589bf3b09e789a5f75fab79421eb858bb9902cde Mon Sep 17 00:00:00 2001
From: Andre Anjos <andre.dos.anjos@gmail.com>
Date: Thu, 10 Jan 2019 12:37:34 +0100
Subject: [PATCH] [ci] Only move conda-bld if there is one
---
ci/bootstrap.sh | 10 ++++++----
1 file changed, 6 insertions(+), 4 deletions(-)
diff --git a/ci/bootstrap.sh b/ci/bootstrap.sh
index 54fb4039..c08f77da 100755
--- a/ci/bootstrap.sh
+++ b/ci/bootstrap.sh
@@ -57,11 +57,13 @@ merge_conda_cache() {
_urlstxt="${1}/urls.txt"
if [ -e ${2} ]; then
log_info "Merging urls.txt and packages with cached files..."
- run_cmd mv ${2}/pkgs/*.tar.bz2 ${1}/pkgs
+ mv ${2}/pkgs/*.tar.bz2 ${1}/pkgs
cat ${_urlstxt} ${_cached_urlstxt} | sort | uniq > ${_urlstxt}
- log_info "Moving conda-bld packages (artifacts)..."
- run_cmd mv ${2}/conda-bld ${1}
- run_cmd conda index ${1}/conda-bld
+ 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
fi
}
--
GitLab