Commit 6ca8652b authored by André Anjos's avatar André Anjos 💬
Browse files

[ci] More fixes (bis)

parent cfc141a8
Pipeline #25794 canceled with stages
in 3 minutes and 16 seconds
......@@ -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
......
......@@ -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/
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment