diff --git a/.circleci/config.yml b/.circleci/config.yml index 654c87040..0aacf1e57 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -4,6 +4,9 @@ executors: docker: - image: filecoin/rust:latest working_directory: /mnt/crate + doxygen: + docker: + - image: hrektts/doxygen restore-workspace: &restore-workspace attach_workspace: @@ -113,6 +116,18 @@ jobs: target: "aarch64-linux-android" + build_doxygen: + executor: doxygen + steps: + - checkout + - run: bash ci_scripts/run-doxygen.sh + - run: mkdir -p workspace/c-docs + - run: cp -av deltachat-ffi/{html,xml} workspace/c-docs/ + - persist_to_workspace: + root: workspace + paths: + - c-docs + build_test_docs_wheel: docker: - image: deltachat/coredeps @@ -148,7 +163,7 @@ jobs: at: workspace - run: pyenv global 3.5.2 - run: ls -laR workspace - - run: ci_scripts/ci_upload.sh workspace/py-docs workspace/wheelhouse + - run: ci_scripts/ci_upload.sh workspace/py-docs workspace/wheelhouse workspace/c-docs clippy: executor: default @@ -166,18 +181,21 @@ workflows: test: jobs: - cargo_fetch + - build_doxygen + - build_test_docs_wheel: requires: - cargo_fetch - upload_docs_wheels: requires: - build_test_docs_wheel + - build_doxygen - rustfmt: requires: - cargo_fetch - clippy: requires: - - cargo_fetch + - cargo_fetch # Linux Desktop 64bit - test_x86_64-unknown-linux-gnu: diff --git a/ci_scripts/ci_upload.sh b/ci_scripts/ci_upload.sh index aff44c61b..ec381c549 100755 --- a/ci_scripts/ci_upload.sh +++ b/ci_scripts/ci_upload.sh @@ -7,9 +7,9 @@ fi set -xe -#DOXYDOCDIR=${1:?directory where doxygen docs to be found} PYDOCDIR=${1:?directory with python docs} WHEELHOUSEDIR=${2:?directory with pre-built wheels} +DOXYDOCDIR=${3:?directory where doxygen docs to be found} export BRANCH=${CIRCLE_BRANCH:?specify branch for uploading purposes} @@ -22,10 +22,10 @@ rsync -avz \ delta@py.delta.chat:build/${BRANCH} # C docs to c.delta.chat -#rsync -avz \ -# -e "ssh -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null" \ -# "$DOXYDOCDIR/html/" \ -# delta@py.delta.chat:build-c/${BRANCH} +rsync -avz \ + -e "ssh -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null" \ + "$DOXYDOCDIR/html/" \ + delta@c.delta.chat:build-c/${BRANCH} echo ----------------------- echo upload wheels diff --git a/ci_scripts/run-doxygen.sh b/ci_scripts/run-doxygen.sh new file mode 100755 index 000000000..5275ee6c9 --- /dev/null +++ b/ci_scripts/run-doxygen.sh @@ -0,0 +1,7 @@ +#!/usr/bin/env bash + +set -ex + +cd deltachat-ffi +doxygen + diff --git a/python/doc/_templates/globaltoc.html b/python/doc/_templates/globaltoc.html index 0901a0d90..fa88e59bc 100644 --- a/python/doc/_templates/globaltoc.html +++ b/python/doc/_templates/globaltoc.html @@ -6,7 +6,6 @@
  • install
  • high level API
  • low level API
  • -
  • C deltachat.h
  • external links: