From 9465ae3b4075d78cf3b172779416ede329bcc19e Mon Sep 17 00:00:00 2001
From: jprochazk <1665677+jprochazk@users.noreply.github.com>
Date: Thu, 6 Jul 2023 10:02:54 +0200
Subject: [PATCH 1/3] attempt to fix deploy docs

---
 .github/workflows/reusable_deploy_docs.yml | 12 ++++++------
 .vscode/settings.json                      |  6 ------
 2 files changed, 6 insertions(+), 12 deletions(-)

diff --git a/.github/workflows/reusable_deploy_docs.yml b/.github/workflows/reusable_deploy_docs.yml
index 2c86174b2093..c01cc8378cae 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
@@ -121,7 +119,8 @@ jobs:
         uses: Swatinem/rust-cache@v2
         with:
           shared-key: "build-linux"
-          env-vars: CARGO CC CFLAGS CXX CMAKE RUST CACHE_KEY
+          env-vars: RUSTFLAGS CARGO CC CFLAGS CXX CMAKE RUST CACHE_KEY
+          cache-targets: false
           save-if: false
 
       # Sccache will cache everything else
@@ -156,3 +155,4 @@ jobs:
         run: |
           git fetch
           python3 -m ghp_import -n -p -x docs/rust/head target/doc/ -m "Update the rust docs"
+
diff --git a/.vscode/settings.json b/.vscode/settings.json
index 4a08b90c21f7..cb71db1ca6a6 100644
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -7,12 +7,6 @@
     },
     "files.insertFinalNewline": true,
     "files.trimTrailingWhitespace": true,
-    "files.exclude": {
-        "target_ra/**": true,
-        "target_wasm/**": true,
-        "target/**": true,
-        "venv/**": true,
-    },
     "files.autoGuessEncoding": true,
     "python.formatting.provider": "black",
     "python.formatting.blackArgs": [

From 25a435823caff03c0ca792e55f96534616be66a2 Mon Sep 17 00:00:00 2001
From: jprochazk <1665677+jprochazk@users.noreply.github.com>
Date: Thu, 6 Jul 2023 10:06:44 +0200
Subject: [PATCH 2/3] remove `target/doc` before rebuilding docs

---
 .github/workflows/reusable_deploy_docs.yml | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/reusable_deploy_docs.yml b/.github/workflows/reusable_deploy_docs.yml
index c01cc8378cae..bf8acd70d1f1 100644
--- a/.github/workflows/reusable_deploy_docs.yml
+++ b/.github/workflows/reusable_deploy_docs.yml
@@ -119,8 +119,7 @@ jobs:
         uses: Swatinem/rust-cache@v2
         with:
           shared-key: "build-linux"
-          env-vars: RUSTFLAGS CARGO CC CFLAGS CXX CMAKE RUST CACHE_KEY
-          cache-targets: false
+          env-vars: CARGO CC CFLAGS CXX CMAKE RUST CACHE_KEY
           save-if: false
 
       # Sccache will cache everything else
@@ -128,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:

From 078db45770067ebb91d6871b6541b4c92ef16e14 Mon Sep 17 00:00:00 2001
From: jprochazk <1665677+jprochazk@users.noreply.github.com>
Date: Thu, 6 Jul 2023 10:48:55 +0200
Subject: [PATCH 3/3] revert files exclude change

---
 .vscode/settings.json | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/.vscode/settings.json b/.vscode/settings.json
index cb71db1ca6a6..4a08b90c21f7 100644
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -7,6 +7,12 @@
     },
     "files.insertFinalNewline": true,
     "files.trimTrailingWhitespace": true,
+    "files.exclude": {
+        "target_ra/**": true,
+        "target_wasm/**": true,
+        "target/**": true,
+        "venv/**": true,
+    },
     "files.autoGuessEncoding": true,
     "python.formatting.provider": "black",
     "python.formatting.blackArgs": [