From 586f5dd9274702575169fe44b74cc6e5a75f09dc Mon Sep 17 00:00:00 2001
From: Andre Anjos <andre.dos.anjos@gmail.com>
Date: Wed, 21 Feb 2018 10:07:12 +0100
Subject: [PATCH] Make conda package deployment re-usable
---
gitlab/deploy.sh | 13 +------------
gitlab/functions.sh | 17 +++++++++++++++++
2 files changed, 18 insertions(+), 12 deletions(-)
diff --git a/gitlab/deploy.sh b/gitlab/deploy.sh
index 7dcd9c9..12bff5d 100755
--- a/gitlab/deploy.sh
+++ b/gitlab/deploy.sh
@@ -3,18 +3,7 @@
source $(dirname ${0})/functions.sh
-# Uploads all the built packages
-for os in "osx-64" "noarch" "linux-64"; do
- for f in ${CONDA_ROOT}/conda-bld/${os}/*.tar.bz2; do
- if [[ -f $f ]]; then
- if [ -z "${CI_COMMIT_TAG}" ]; then #beta
- dav_upload "${f}" "private-upload/conda/${os}/"
- else
- dav_upload "${f}" "public-upload/conda/label/main/${os}/"
- fi
- fi
- done
-done
+deploy_conda_packages
# upload the docs from the sphinx folder (usually an artifact of Linux Python
# 3.6 builds)
diff --git a/gitlab/functions.sh b/gitlab/functions.sh
index 4e9f47b..a1b78af 100644
--- a/gitlab/functions.sh
+++ b/gitlab/functions.sh
@@ -333,6 +333,23 @@ install_miniconda() {
}
+# deployes all conda packages built up to now
+deploy_conda_packages() {
+ # Uploads all the built packages
+ for os in "osx-64" "noarch" "linux-64"; do
+ for f in ${CONDA_ROOT}/conda-bld/${os}/*.tar.bz2; do
+ if [[ -f $f ]]; then
+ if [ -z "${CI_COMMIT_TAG}" ]; then #beta
+ dav_upload "${f}" "private-upload/conda/${os}/"
+ else
+ dav_upload "${f}" "public-upload/conda/label/main/${os}/"
+ fi
+ fi
+ done
+ done
+}
+
+
check_env PYTHON_VERSION
check_env CI_PROJECT_URL
check_env CI_PROJECT_DIR
--
GitLab