From d23f1e43be17357ba4bd6676d32462eff44c198e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20Proch=C3=A1zka?= <1665677+jprochazk@users.noreply.github.com> Date: Thu, 6 Jul 2023 10:49:25 +0200 Subject: [PATCH] Fix rust docs deploy (#2615) ### What Remove the `/target/doc` directory before building and deploying docs. This should fix the rust docs deploy issue, but it will be unconfirmed until we merge into main Also removes the `files.exclude` vscode setting for already gitignored directories. I keep having to dig into target dirs and/or the venv and it's pretty annoying to keep this change around locally inbetween all the git checkouts. I don't see why we need it in the first place, it just removes the files from the explorer pane. That makes it a bit shorter, but not by a lot. ### Checklist * [x] I have read and agree to [Contributor Guide](https://github.com/rerun-io/rerun/blob/main/CONTRIBUTING.md) and the [Code of Conduct](https://github.com/rerun-io/rerun/blob/main/CODE_OF_CONDUCT.md) * [x] I've included a screenshot or gif (if applicable) * [x] I have tested [demo.rerun.io](https://demo.rerun.io/pr/2615) (if applicable) - [PR Build Summary](https://build.rerun.io/pr/2615) - [Docs preview](https://rerun.io/preview/pr%3Ajan%2Ffix-deploy-docs/docs) - [Examples preview](https://rerun.io/preview/pr%3Ajan%2Ffix-deploy-docs/examples) --- .github/workflows/reusable_deploy_docs.yml | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/.github/workflows/reusable_deploy_docs.yml b/.github/workflows/reusable_deploy_docs.yml index 2c86174b2093..bf8acd70d1f1 100644 --- a/.github/workflows/reusable_deploy_docs.yml +++ b/.github/workflows/reusable_deploy_docs.yml @@ -1,4 +1,4 @@ -name: 'Reusable Deploy Docs' +name: "Reusable Deploy Docs" on: workflow_call: @@ -33,8 +33,7 @@ env: RUSTC_WRAPPER: "sccache" jobs: - -# --------------------------------------------------------------------------- + # --------------------------------------------------------------------------- py-deploy-docs: name: Python @@ -90,8 +89,7 @@ jobs: git commit -m "Update docs for ${GITHUB_SHA}" git push origin gh-pages-orphan:gh-pages -f - -# --------------------------------------------------------------------------- + # --------------------------------------------------------------------------- rs-deploy-docs: name: Rust @@ -129,6 +127,9 @@ jobs: - name: Run sccache-cache uses: mozilla-actions/sccache-action@v0.0.3 + - name: Delete existing /target/doc + run: rm -rf ./target/doc + - name: cargo doc --document-private-items uses: actions-rs/cargo@v1 with: @@ -156,3 +157,4 @@ jobs: run: | git fetch python3 -m ghp_import -n -p -x docs/rust/head target/doc/ -m "Update the rust docs" +