From 5f72a3f4d8a747fb1d01915a4bb756523ddffdf7 Mon Sep 17 00:00:00 2001
From: Andre Anjos <andre.anjos@idiap.ch>
Date: Tue, 14 Feb 2017 09:28:15 +0100
Subject: [PATCH] Correctly setup BOB_DOCUMENTATION_SERVER in case of stable
builds
---
gitlab/functions.sh | 17 +++++++++--------
1 file changed, 9 insertions(+), 8 deletions(-)
diff --git a/gitlab/functions.sh b/gitlab/functions.sh
index 6474972..baef86f 100644
--- a/gitlab/functions.sh
+++ b/gitlab/functions.sh
@@ -272,18 +272,19 @@ check_env CONDA_FOLDER
check_env CONDA_ENV
export_env BOB_PREFIX_PATH
+# Setup default documentation server
if [ -z "${CI_BUILD_TAG}" ]; then
DEFSRV="${DOCSERVER}/software/bob/docs/latest/bob/%s/master/"
- if [ -z "${BOB_DOCUMENTATION_SERVER}" ]; then
- BOB_DOCUMENTATION_SERVER="${DEFSRV}"
- else
- BOB_DOCUMENTATION_SERVER="${BOB_DOCUMENTATION_SERVER}|${DEFSRV}"
- fi
- unset DEFSRV
- export_env BOB_DOCUMENTATION_SERVER
else
- log_info "Building tag, not setting BOB_DOCUMENTATION_SERVER"
+ DEFSRV="http://pythonhosted.org/%s/"
+fi
+if [ -z "${BOB_DOCUMENTATION_SERVER}" ]; then
+ BOB_DOCUMENTATION_SERVER="${DEFSRV}"
+else
+ BOB_DOCUMENTATION_SERVER="${BOB_DOCUMENTATION_SERVER}|${DEFSRV}"
fi
+unset DEFSRV
+export_env BOB_DOCUMENTATION_SERVER
# sets up certificates for curl and openssl
CURL_CA_BUNDLE="${SCRIPTS_DIR}/cacert.pem"
--
GitLab