From 0ebe51a42453c70a197bb915d243a742217eef62 Mon Sep 17 00:00:00 2001
From: Andre Anjos <andre.anjos@idiap.ch>
Date: Thu, 4 May 2017 13:56:36 +0200
Subject: [PATCH] Use public/private website organization
---
gitlab/docs.sh | 2 +-
gitlab/functions.sh | 4 ++--
gitlab/wheels.sh | 2 +-
3 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/gitlab/docs.sh b/gitlab/docs.sh
index d2a62c3..a21203d 100755
--- a/gitlab/docs.sh
+++ b/gitlab/docs.sh
@@ -15,4 +15,4 @@ echo "runner=${CI_RUNNER_DESCRIPTION}" >> ${info}
file=${CI_PROJECT_NAME}-${CI_BUILD_REF}.tar.bz2
run_cmd tar cfj ${file} sphinx
-doc_upload ${file} software/bob/docs-upload/
+dav_upload ${file} public-upload/docs/incoming
diff --git a/gitlab/functions.sh b/gitlab/functions.sh
index baef86f..6f3f626 100644
--- a/gitlab/functions.sh
+++ b/gitlab/functions.sh
@@ -163,8 +163,8 @@ setup_deploy() {
# Uploads a file to our intranet location via curl
# $1: Path to the file to upload (e.g. dist/myfile.whl)
-# $2: Path on the server to upload to (e.g. wheels-upload/gitlab/)
-doc_upload() {
+# $2: Path on the server to upload to (e.g. private-upload/wheels/gitlab/)
+dav_upload() {
log_info "curl: ${1} -> ${DOCSERVER}/${2}..."
local code=`curl --location --silent --fail --write-out "%{http_code}" --user "${DOCUSER}:${DOCPASS}" --upload-file ${1} ${DOCSERVER}/${2}`
if [[ ${code} == *204 || ${code} == *201 ]]; then
diff --git a/gitlab/wheels.sh b/gitlab/wheels.sh
index 7382134..25b13d2 100755
--- a/gitlab/wheels.sh
+++ b/gitlab/wheels.sh
@@ -4,5 +4,5 @@
source $(dirname ${0})/functions.sh
for file in dist/*.whl; do
- doc_upload ${file} wheels-upload/gitlab/
+ dav_upload ${file} private-upload/wheels/gitlab/
done
--
GitLab