From 37e817601a8e9649005d69dc089a6b43339596ac Mon Sep 17 00:00:00 2001
From: Jiahao XU <30436523+NobodyXu@users.noreply.github.com>
Date: Sun, 25 Aug 2024 21:00:08 +1000
Subject: [PATCH] Fix action.yml

Add missing shell, and merge steps for adding windows defender exclusion

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

diff --git a/.github/actions/just-setup/action.yml b/.github/actions/just-setup/action.yml
index 57c6c7a7..137ea05f 100644
--- a/.github/actions/just-setup/action.yml
+++ b/.github/actions/just-setup/action.yml
@@ -18,9 +18,10 @@ inputs:
 runs:
   using: composite
   steps:
-  - name: Enable macOS developer mode for better performance
-    run: sudo spctl developer-mode enable-terminal
+  - name: Enable macOS developer mode for better
     if: runner.os == 'macOS'
+    run: sudo spctl developer-mode enable-terminal
+    shell: bash
 
   - uses: samypr100/setup-dev-drive@v3
     if: runner.os == 'Windows'
@@ -31,9 +32,11 @@ runs:
         CARGO_HOME,{{ DEV_DRIVE }}/.cargo
         RUSTUP_HOME,{{ DEV_DRIVE }}/.rustup
         
-  - name: Exclude cargo/rustup home from windows defender
+  - name: Exclude workspace and cargo/rustup home from windows defender
     if: runner.os == 'Windows'
-    run: Add-MpPreference -ExclusionPath $DEV_DRIVE
+    run: |
+      Add-MpPreference -ExclusionPath $DEV_DRIVE -ExclusionPath $PWD
+    shell: bash
     
   - uses: samypr100/setup-dev-drive@v3
     if: runner.os == 'Windows'
@@ -41,10 +44,6 @@ runs:
       mount-path: ${{ github.workspace }}/target
       drive-size: 3GB
       drive-type: Fixed
-
-  - name: Exclude target from windows defender
-    if: runner.os == 'Windows'
-    run: Add-MpPreference -ExclusionPath $PWD
   
   - name: Add just to tools to install
     run: echo "tools=just" >>"$GITHUB_ENV"