Skip to content
Snippets Groups Projects
Commit 82cbd93d authored by André Anjos's avatar André Anjos :speech_balloon:
Browse files

Switch variable name to avoid conflict with conda setup

parent 7d917eda
No related branches found
No related tags found
No related merge requests found
...@@ -202,8 +202,8 @@ if [ -z "${CONDA_FOLDER}" ]; then ...@@ -202,8 +202,8 @@ if [ -z "${CONDA_FOLDER}" ]; then
CONDA_FOLDER=/opt/conda CONDA_FOLDER=/opt/conda
fi fi
if [ -z "${CONDA_PREFIX}" ]; then if [ -z "${VIRTUALENV_PATH}" ]; then
CONDA_PREFIX=env VIRTUALENV_PATH=env
fi fi
if [ -z "${DOCSERVER}" ]; then if [ -z "${DOCSERVER}" ]; then
...@@ -211,7 +211,7 @@ if [ -z "${DOCSERVER}" ]; then ...@@ -211,7 +211,7 @@ if [ -z "${DOCSERVER}" ]; then
export_env DOCSERVER export_env DOCSERVER
fi fi
PREFIX=${CI_PROJECT_DIR}/${CONDA_PREFIX} PREFIX=${CI_PROJECT_DIR}/${VIRTUALENV_PATH}
if [ "${ARCH}" == "linux" ]; then if [ "${ARCH}" == "linux" ]; then
# Temporary hack to get building done right with gcc-5 compilers # Temporary hack to get building done right with gcc-5 compilers
...@@ -252,7 +252,7 @@ check_env DOCSERVER ...@@ -252,7 +252,7 @@ check_env DOCSERVER
check_env PYPISERVER check_env PYPISERVER
check_env TESTSERVER check_env TESTSERVER
check_env CONDA_FOLDER check_env CONDA_FOLDER
check_env CONDA_PREFIX check_env VIRTUALENV_PATH
export_env LD_LIBRARY_PATH export_env LD_LIBRARY_PATH
export_env BOB_PREFIX_PATH export_env BOB_PREFIX_PATH
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment