From 949d93fdaafcc187a482465223eedff072e7446c Mon Sep 17 00:00:00 2001 From: holger krekel Date: Tue, 21 Jan 2020 18:30:12 +0100 Subject: [PATCH] - actually also upload py docs, not only c docs - delete unused files on remote - show a project number in doxygen --- ci_scripts/ci_upload.sh | 14 ++++++++------ ci_scripts/run-doxygen.sh | 3 +-- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/ci_scripts/ci_upload.sh b/ci_scripts/ci_upload.sh index c609bfc0b..bb610aa53 100755 --- a/ci_scripts/ci_upload.sh +++ b/ci_scripts/ci_upload.sh @@ -14,16 +14,18 @@ DOXYDOCDIR=${3:?directory where doxygen docs to be found} export BRANCH=${CIRCLE_BRANCH:?specify branch for uploading purposes} -# DISABLED: 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/" \ -# delta@py.delta.chat:build/${BRANCH} +# python docs to py.delta.chat +ssh -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null delta@py.delta.chat mkdir -p build/${BRANCH} +rsync -avz \ + --delete \ + -e "ssh -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null" \ + "$PYDOCDIR/html/" \ + delta@py.delta.chat:build/${BRANCH} # C docs to c.delta.chat ssh -o BatchMode=yes -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null delta@c.delta.chat mkdir -p build-c/${BRANCH} rsync -avz \ + --delete \ -e "ssh -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null" \ "$DOXYDOCDIR/html/" \ delta@c.delta.chat:build-c/${BRANCH} diff --git a/ci_scripts/run-doxygen.sh b/ci_scripts/run-doxygen.sh index 5275ee6c9..190b27dae 100755 --- a/ci_scripts/run-doxygen.sh +++ b/ci_scripts/run-doxygen.sh @@ -3,5 +3,4 @@ set -ex cd deltachat-ffi -doxygen - +PROJECT_NUMBER=$(git log -1 --format "%h (%cd)") doxygen