From 7d03b217974cb8fd0f3e5d173ff5de24ed78f9b7 Mon Sep 17 00:00:00 2001 From: Amir MOHAMMADI <amir.mohammadi@idiap.ch> Date: Thu, 28 Sep 2017 18:35:40 +0200 Subject: [PATCH] Use custom defaults channels --- gitlab/build.sh | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/gitlab/build.sh b/gitlab/build.sh index 07ecf3b..dea1366 100755 --- a/gitlab/build.sh +++ b/gitlab/build.sh @@ -2,9 +2,7 @@ # Wed 21 Sep 2016 13:08:05 CEST source $(dirname ${0})/functions.sh -log_info ${CONDA_FOLDER}/bin/conda config --remove channels c3i_test -${CONDA_FOLDER}/bin/conda config --remove channels c3i_test -run_cmd ${CONDA_FOLDER}/bin/conda install --override-channels -c defaults -n root --yes --quiet conda=4.3.27 conda-build=3.0.22 +run_cmd ${CONDA_FOLDER}/bin/conda install --override-channels -c https://repo.continuum.io/pkgs/main -c https://repo.continuum.io/pkgs/free -c https://repo.continuum.io/pkgs/r -c https://repo.continuum.io/pkgs/pro -n root --yes --quiet conda=4.3.27 conda-build=3.0.22 run_cmd ${CONDA_FOLDER}/bin/conda config --set always_yes yes --set changeps1 no run_cmd ${CONDA_FOLDER}/bin/conda config --set show_channel_urls true run_cmd ${CONDA_FOLDER}/bin/conda config --set add_pip_as_python_dependency False @@ -26,9 +24,9 @@ BOB_BUILD_NUMBER=`head -n 1 ./_ci/${OS_SLUG}/${PYTHON_VERSION}/build_number.txt export_env BOB_BUILD_NUMBER if [ -z "${CI_COMMIT_TAG}" ]; then - run_cmd ${CONDA_FOLDER}/bin/conda build --override-channels -c ${CONDA_BETA_CHANNEL} -c ${CONDA_CHANNEL} -c defaults --python=${PYTHON_VERSION} conda + run_cmd ${CONDA_FOLDER}/bin/conda build --override-channels -c ${CONDA_BETA_CHANNEL} -c ${CONDA_CHANNEL} -c https://repo.continuum.io/pkgs/main -c https://repo.continuum.io/pkgs/free -c https://repo.continuum.io/pkgs/r -c https://repo.continuum.io/pkgs/pro --python=${PYTHON_VERSION} conda else - run_cmd ${CONDA_FOLDER}/bin/conda build --override-channels -c ${CONDA_CHANNEL} -c defaults --python=${PYTHON_VERSION} conda + run_cmd ${CONDA_FOLDER}/bin/conda build --override-channels -c ${CONDA_CHANNEL} -c https://repo.continuum.io/pkgs/main -c https://repo.continuum.io/pkgs/free -c https://repo.continuum.io/pkgs/r -c https://repo.continuum.io/pkgs/pro --python=${PYTHON_VERSION} conda fi # Copy the .tar.bz2 and urls.txt -- GitLab