diff --git a/_ci/after_build.sh b/_ci/after_build.sh index d3798e096e356884640877fa4610c8157e3c6dc0..61d728f408987bb1b280b484c12d86843272a072 100755 --- a/_ci/after_build.sh +++ b/_ci/after_build.sh @@ -15,8 +15,7 @@ run_cmd git clean -ffdx \ --exclude="miniconda.sh" \ --exclude="miniconda/pkgs/*.tar.bz2" \ --exclude="miniconda/pkgs/urls.txt" \ - --exclude="miniconda/conda-bld/linux-64/*.tar.bz2" \ - --exclude="miniconda/conda-bld/osx-64/*.tar.bz2" \ + --exclude="miniconda/conda-bld/${OS_SLUG}/*.tar.bz2" \ --exclude="_ci" \ --exclude="dist/*.zip" \ --exclude="sphinx" diff --git a/_ci/functions.sh b/_ci/functions.sh index 9c2fcddfc02d44941ce5704b437868b937ee08a2..f5e044defd0ad5a7c697786685d839c9d6975ac4 100644 --- a/_ci/functions.sh +++ b/_ci/functions.sh @@ -187,6 +187,11 @@ set_conda_channels() { } +if [ -z "${OS_SLUG}" ]; then + OS_SLUG="${OSNAME}-64" +fi + +export_env OS_SLUG log_env PYTHON_VERSION check_env CI_PROJECT_DIR check_env CI_PROJECT_NAME @@ -202,11 +207,6 @@ DOCSERVER=http://www.idiap.ch # Sets up the location of our rc file for conda CONDARC=${CONDA_ROOT}/condarc -if [ -z "${OS_SLUG}" ]; then - OS_SLUG="${OSNAME}-64" -fi - -export_env OS_SLUG export_env DOCSERVER check_env CONDA_ROOT export_env CONDARC