From 92c1d5e961eb1729f691d3493bf9a6ce08ca5e2b Mon Sep 17 00:00:00 2001 From: holger krekel Date: Sun, 11 Aug 2019 22:55:25 +0200 Subject: [PATCH] try fix upload failure with / branches --- ci_scripts/ci_upload.sh | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/ci_scripts/ci_upload.sh b/ci_scripts/ci_upload.sh index f79299573..ae3cb64e3 100755 --- a/ci_scripts/ci_upload.sh +++ b/ci_scripts/ci_upload.sh @@ -15,6 +15,7 @@ export BRANCH=${CIRCLE_BRANCH:?specify branch for uploading purposes} # python docs to py.delta.chat +ssh -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null delta@py.delta.chat mkdir -p build/${BRANCH} rsync -avz \ -e "ssh -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null" \ "$PYDOCDIR/html/" \ @@ -37,11 +38,13 @@ pip install devpi-client devpi use https://m.devpi.net devpi login dc --password $DEVPI_LOGIN -devpi use dc/$BRANCH || { - devpi index -c $BRANCH - devpi use dc/$BRANCH +N_BRANCH=${BRANCH//[\/]} + +devpi use dc/$N_BRANCH || { + devpi index -c $N_BRANCH + devpi use dc/$N_BRANCH } -devpi index $BRANCH bases=/root/pypi +devpi index $N_BRANCH bases=/root/pypi devpi upload deltachat*.whl popd