From 6687219cd08aa54a681e6577b53ba706114e3465 Mon Sep 17 00:00:00 2001
From: Jiahao XU <30436523+NobodyXu@users.noreply.github.com>
Date: Sun, 25 Aug 2024 21:26:03 +1000
Subject: [PATCH] Fix caching: Do not mount dev drive at target

Since it contains files that are not accessible.

Also remove use of dev drive for cargo/rustup home since it prevents caching (rust-cache does not read from env).

Signed-off-by: Jiahao XU <30436523+NobodyXu@users.noreply.github.com>
---
 .github/actions/just-setup/action.yml | 20 +++++++++-----------
 1 file changed, 9 insertions(+), 11 deletions(-)

diff --git a/.github/actions/just-setup/action.yml b/.github/actions/just-setup/action.yml
index 15ac1044..78e908bf 100644
--- a/.github/actions/just-setup/action.yml
+++ b/.github/actions/just-setup/action.yml
@@ -23,14 +23,19 @@ runs:
     run: sudo spctl developer-mode enable-terminal
     shell: bash
 
+  - name: Export CARGO_TARGET_DIR
+    if: runner.os != 'Windows'
+    run: |
+      echo "CARGO_TARGET_DIR=${{ github.workspace }}/target" >> "$GITHUB_ENV"
+    shell: bash
+
   - uses: samypr100/setup-dev-drive@v3
     if: runner.os == 'Windows'
     with:
       drive-type: Fixed
-      drive-size: 2GB
+      drive-size: 3GB
       env-mapping: |
-        CARGO_HOME,{{ DEV_DRIVE }}/.cargo
-        RUSTUP_HOME,{{ DEV_DRIVE }}/.rustup
+        CARGO_TARGET_DIR,{{ DEV_DRIVE }}/target
         
   - name: Exclude workspace and cargo/rustup home from windows defender
     if: runner.os == 'Windows'
@@ -38,14 +43,6 @@ runs:
       Add-MpPreference -ExclusionPath '${{ env.DEV_DRIVE }},${{ github.workspace }}'
     shell: pwsh
     
-  - uses: samypr100/setup-dev-drive@v3
-    if: runner.os == 'Windows'
-    with:
-      mount-path: ${{ github.workspace }}/target
-      drive-size: 3GB
-      drive-type: Fixed
-      drive-path: D:\target_drive.vhdx
-  
   - name: Add just to tools to install
     run: echo "tools=just" >>"$GITHUB_ENV"
     shell: bash
@@ -88,6 +85,7 @@ runs:
     uses: Swatinem/rust-cache@v2
     with:
       env-vars: "CARGO CC CFLAGS CXX CMAKE RUST JUST"
+      workspaces: . -> ${{ env.CARGO_TARGET_DIR }}
     env:
       RUSTFLAGS: ${{ steps.retrieve-rustflags.outputs.RUSTFLAGS }}