diff --git a/ci/bootstrap.sh b/ci/bootstrap.sh index b88688f638549c9ef072d6321191de365c3dadeb..438c482c76cc7597f3926bfae6a0f1598ec5f0f9 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 69c51257463bdef41542c70f403141da18550fe4..70978e2be2c76a7e0abd26f17f498fbfdb69745f 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/