From f64d48bb1aa84bd3396c1600552a42dd4d35968e Mon Sep 17 00:00:00 2001
From: jaden <noreply@example.com>
Date: Mon, 26 Jun 2017 17:02:37 +0200
Subject: [PATCH] Revert "rm code defining unused BOB_DOCUMENTATION_SERVER
export"
Turns out this is being used
---
gitlab/functions.sh | 18 ++++++++++++++++++
1 file changed, 18 insertions(+)
diff --git a/gitlab/functions.sh b/gitlab/functions.sh
index 8710fe5..2d7cccc 100644
--- a/gitlab/functions.sh
+++ b/gitlab/functions.sh
@@ -423,6 +423,24 @@ check_env CONDA_FOLDER
check_env CONDA_ENV
export_env BOB_PREFIX_PATH
+# Setup default documentation server
+if [ -z "${CI_COMMIT_TAG}" ]; then
+ DEFSRV="${DOCSERVER}/software/bob/docs/bob/%s/master/"
+else
+ 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
+if [ "${VISIBILITY}" != "public" ]; then
+ # If private or internal, allow it to depend on other internal documents
+ BOB_DOCUMENTATION_SERVER="${BOB_DOCUMENTATION_SERVER}|${DOCSERVER}/private/docs/bob/%s/master/"
+fi
+unset DEFSRV
+export_env BOB_DOCUMENTATION_SERVER
+
# Sets up certificates for curl and openssl
CURL_CA_BUNDLE="${SCRIPTS_DIR}/cacert.pem"
export_env CURL_CA_BUNDLE
--
GitLab