Trying to improve docs build pipeline

.gitignore

@@ -5,3 +5,4 @@
 .idea
 **/.vscode
 install/
+api-docs/

Makefile

@@ -302,32 +302,18 @@ dep-graph:
 
 docs:
 	cargo doc --features=backend-singlepass,backend-cranelift,backend-llvm,docs,wasi,managed
+	cd lib/runtime-c-api/ && doxygen doxyfile && cd ..
 
 docs-publish:
-	echo a
-	git remote -v
-	echo b
-	git checkout gh-pages
-	echo b2
-	git remote add wasmerbot https://WasmerBot:${GITHUB_DOCS_TOKEN}@github.com/wasmerio/wasmer.git
-	echo d
-	cp -r ${RUST_DOCS_DIR}/* rustdoc/
-	echo f
-	echo '<meta http-equiv="refresh" content="0; url=rustdoc/wasmer_runtime/index.html">' > index.html
-	echo g
-	echo '<meta http-equiv="refresh" content="0; url=wasmer_runtime/index.html">' > rustdoc/index.html
-	echo h
-	git config --local user.name "Azure Pipelines"
-	echo i
-	git config --local user.email "[email protected]"
-	echo j
-	git add index.html
-	git add rustdoc/*
-	echo k
-	git commit -m "Publishing GitHub Pages ***CI***"
-	echo l
-	git push wasmerbot gh-pages
-	echo m
+	git clone -b "gh-pages" --depth=1 https://wasmerbot:${GITHUB_DOCS_TOKEN}@github.com/wasmerio/wasmer.git api-docs
+	mkdir -p api-docs/c
+	cp -R target/doc api-docs/rust
+	cp -R lib/runtime-c-api/doc/html api-docs/c/runtime-c-api
+	echo '<meta http-equiv="refresh" content="0; url=rust/wasmer_runtime/index.html">' > api-docs/index.html
+	echo '<meta http-equiv="refresh" content="0; url=wasmer_runtime/index.html">' > api-docs/rust/index.html
+	cd api-docs && git add index.html rust/* c/*
+	cd api-docs && git commit -m "Publishing GitHub Pages ***CI***"
+	cd api-docs && git push origin gh-pages
 
 wapm:
 	cargo build --release --manifest-path wapm-cli/Cargo.toml --features "telemetry update-notifications"

azure-pipelines.yml

@@ -215,19 +215,23 @@ jobs:
       vmImage: "ubuntu-16.04"
     variables:
       rust_toolchain: nightly-2019-08-15
-    condition: in(variables['Build.SourceBranch'], 'refs/heads/master', 'refs/heads/staging', 'refs/heads/trying')
+    # condition: in(variables['Build.SourceBranch'], 'refs/heads/master', 'refs/heads/staging', 'refs/heads/trying')
     steps:
       - checkout: self
         submodules: true
       - template: .azure/install-rust.yml
       - template: .azure/install-llvm.yml
       - template: .azure/install-sccache.yml
       - template: .azure/install-cmake.yml
+      - bash: |
+        sudo apt-get install doxygen graphviz
+        displayName: Install doxygen
       - bash: |
           make docs
-      - publish: target/doc
-        artifact: rustdocs
-        displayName: Build documentation
+        displayName: Build docs
+      - publish: api-docs
+        artifact: api-docs
+        displayName: Publish doc artifact
 
   - job: Publish
     dependsOn:
@@ -290,12 +294,12 @@ jobs:
       - checkout: self
       - task: DownloadPipelineArtifact@2
         inputs:
-          artifactName: rustdocs
-          targetPath: $(Pipeline.Workspace)/rustdocs
+          artifactName: api-docs
+          targetPath: $(Pipeline.Workspace)/api-docs
       - bash: |
           make docs-publish
         env:
-          RUST_DOCS_DIR: $(Pipeline.Workspace)/rustdocs
+          RUST_DOCS_DIR: $(Pipeline.Workspace)/api-docs
 
 # We only run the pipelines on PRs to Master
 pr:

lib/runtime-c-api/doxyfile

@@ -305,7 +305,7 @@ EXTERNAL_PAGES         = YES
 CLASS_DIAGRAMS         = YES
 DIA_PATH               =
 HIDE_UNDOC_RELATIONS   = YES
-HAVE_DOT               = YES
+HAVE_DOT               = NO
 DOT_NUM_THREADS        = 0
 DOT_FONTNAME           = Helvetica
 DOT_FONTSIZE           = 10
@@ -324,7 +324,7 @@ GRAPHICAL_HIERARCHY    = YES
 DIRECTORY_GRAPH        = YES
 DOT_IMAGE_FORMAT       = svg
 INTERACTIVE_SVG        = YES
-DOT_PATH               =
+DOT_PATH               = ${DOXYGEN_DOT_PATH}
 DOTFILE_DIRS           =
 MSCFILE_DIRS           =
 DIAFILE_DIRS           =