Commit 8a900714 authored by Paul McCarthy's avatar Paul McCarthy 🚵
Browse files

Merge branch 'bf/condadir' into 'master'

Bf/condadir

See merge request fsl/fsl-ci-rules!88
parents ffe04e99 fab514c5
......@@ -19,7 +19,7 @@ import subprocess as sp
import yaml
__version__ = '0.16.3'
__version__ = '0.16.4'
"""Current version of the fsl-ci-rules."""
......
......@@ -75,10 +75,10 @@
# Otherwise create a conda env in the job work
# dir, and install fsl-ci-rules into it
- if [ "$DOCKER" == "0" ]; then
CONDADIR=$(dirname $(which conda))
CONDADIR=$(dirname $(which conda));
conda create -y -p ${FSL_CI_CONFIG_DIR}/env -c conda-forge python=3.9 conda-build;
if [ -f "${CONDADIR}"/activate ]; then source ${CONDADIR}/activate ${FSL_CI_CONFIG_DIR}/env;
else conda activate ${FSL_CI_CONFIG_DIR}/env; fi
else conda activate ${FSL_CI_CONFIG_DIR}/env; fi;
fi
- if [ "$CI_PROJECT_PATH" == "fsl/fsl-ci-rules" ]; then
python -m pip install .;
......
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