diff --git a/gitlab/before_build.sh b/gitlab/before_build.sh index 11f193b74c13f7f68785232b37203021a82c7446..f93f15830000ae004b5c3c10a9eab1bb6cf6f7ef 100755 --- a/gitlab/before_build.sh +++ b/gitlab/before_build.sh @@ -19,21 +19,23 @@ default_channels: - https://repo.continuum.io/pkgs/r - https://repo.continuum.io/pkgs/pro EOF -echo "Contents of \`${CONDARC}':" -cat ${CONDARC} run_cmd ${CONDA_ROOT}/bin/conda config --set add_pip_as_python_dependency false -run_cmd ${CONDA_ROOT}/bin/conda config --set always_yes yes --set changeps1 no +run_cmd ${CONDA_ROOT}/bin/conda config --set changeps1 false run_cmd ${CONDA_ROOT}/bin/conda config --set always_yes true run_cmd ${CONDA_ROOT}/bin/conda config --set quiet true run_cmd ${CONDA_ROOT}/bin/conda config --set show_channel_urls true -run_cmd ${CONDA_ROOT}/bin/conda config --set anaconda_upload no +run_cmd ${CONDA_ROOT}/bin/conda config --set anaconda_upload false run_cmd ${CONDA_ROOT}/bin/conda config --add channels ${CONDA_CHANNEL} if [ -z "${CI_COMMIT_TAG}" ]; then run_cmd ${CONDA_ROOT}/bin/conda config --add channels ${CONDA_BETA_CHANNEL} fi run_cmd ${CONDA_ROOT}/bin/conda config --set ssl_verify false +# displays contents of our configuration +echo "Contents of \`${CONDARC}':" +cat ${CONDARC} + # updates conda installation run_cmd ${CONDA_ROOT}/bin/conda install --quiet --yes python conda=4.4 curl conda-build=3 diff --git a/gitlab/build.sh b/gitlab/build.sh index d7275ea2a339a4b7d6cc133956cdb19947444378..74764a3934f0fa39ab82f0109f7d4404e49ce3ac 100755 --- a/gitlab/build.sh +++ b/gitlab/build.sh @@ -4,6 +4,8 @@ source $(dirname ${0})/functions.sh # Makes sure we activate the base environment if available +PATH=${CONDA_ROOT}/bin:${PATH} +export_env PATH run_cmd source ${CONDA_ROOT}/etc/profile.d/conda.sh run_cmd conda activate base