From 6ca8652b6c7f1d20d225ec513c523c8b2f704244 Mon Sep 17 00:00:00 2001
From: Andre Anjos <andre.dos.anjos@gmail.com>
Date: Thu, 10 Jan 2019 09:33:34 +0100
Subject: [PATCH] [ci] More fixes (bis)
---
ci/bootstrap.sh | 2 +-
ci/build.sh | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/ci/bootstrap.sh b/ci/bootstrap.sh
index b88688f6..438c482c 100755
--- a/ci/bootstrap.sh
+++ b/ci/bootstrap.sh
@@ -38,7 +38,7 @@ merge_conda_cache() {
_urlstxt="${1}/urls.txt"
if [ -e ${2} ]; then
log_info "Merging urls.txt and packages with cached files..."
- mv ${2}/*.tar.bz2 ${1}/
+ log_info mv ${2}/*.tar.bz2 ${1}/
cat ${_urlstxt} ${_cached_urlstxt} | sort | uniq > ${_urlstxt}
fi
fi
diff --git a/ci/build.sh b/ci/build.sh
index 69c51257..70978e2b 100755
--- a/ci/build.sh
+++ b/ci/build.sh
@@ -63,8 +63,8 @@ else
fi
log_info "$ ${CONDA_ROOT}/bin/python ${CI_PROJECT_DIR}/ci/nextbuild.py ${channel} ${CI_PROJECT_NAME} ${BOB_PACKAGE_VERSION} ${PYTHON_VERSION}"
-BOB_BUILD_NUMBER=$(${CONDA_ROOT}/bin/python ${CI_PROJECT_DIR}/ci/nextbuild.py ${channel} ${CI_PROJECT_NAME} ${BOB_PACKAGE_VERSION} ${PYTHON_VERSION})
-export_env BOB_BUILD_NUMBER
+export BOB_BUILD_NUMBER=$(${CONDA_ROOT}/bin/python ${CI_PROJECT_DIR}/ci/nextbuild.py ${channel} ${CI_PROJECT_NAME} ${BOB_PACKAGE_VERSION} ${PYTHON_VERSION})
+check_defined BOB_BUILD_NUMBER
# copy the recipe_append.yaml over before build
run_cmd cp ${CI_PROJECT_DIR}/bob/devtools/data/recipe_append.yaml conda/
--
GitLab