From 74f038f5e52cc8022bc183dd9e949502b7dc7f34 Mon Sep 17 00:00:00 2001
From: Andre Anjos <andre.dos.anjos@gmail.com>
Date: Wed, 9 Jan 2019 15:24:00 +0100
Subject: [PATCH] [ci] Use OS_SLUG
---
_ci/after_build.sh | 3 +--
_ci/functions.sh | 10 +++++-----
2 files changed, 6 insertions(+), 7 deletions(-)
diff --git a/_ci/after_build.sh b/_ci/after_build.sh
index d3798e09..61d728f4 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 9c2fcddf..f5e044de 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
--
GitLab