From 5f12a51373b579b45c7b3d5954194833eb5eb261 Mon Sep 17 00:00:00 2001
From: schm1dtmac <schm1dtxbox@icloud.com>
Date: Sat, 31 May 2025 18:40:12 +0100
Subject: [PATCH] Suggested review changes

---
 .ci/build-mac-arm64.sh      |  1 -
 .ci/build-mac.sh            |  1 -
 .github/workflows/rpcs3.yml | 32 +++++++++++---------------------
 .vscode/settings.json       |  3 +++
 4 files changed, 14 insertions(+), 23 deletions(-)
 create mode 100644 .vscode/settings.json

diff --git a/.ci/build-mac-arm64.sh b/.ci/build-mac-arm64.sh
index 631aca0ecc..d1b48c03f9 100755
--- a/.ci/build-mac-arm64.sh
+++ b/.ci/build-mac-arm64.sh
@@ -72,7 +72,6 @@ git submodule -q update --init --depth=1 --jobs=8 $(awk '/path/ && !/ffmpeg/ &&
 # 3rdparty fixes
 sed -i '' "s/extern const double NSAppKitVersionNumber;/const double NSAppKitVersionNumber = 1343;/g" 3rdparty/hidapi/hidapi/mac/hid.c
 
-rm -rf build
 mkdir build && cd build || exit 1
 
 export MACOSX_DEPLOYMENT_TARGET=14.0
diff --git a/.ci/build-mac.sh b/.ci/build-mac.sh
index 316d845b9a..675811539e 100755
--- a/.ci/build-mac.sh
+++ b/.ci/build-mac.sh
@@ -75,7 +75,6 @@ git submodule -q update --init --depth=1 --jobs=8 $(awk '/path/ && !/ffmpeg/ &&
 # 3rdparty fixes
 sed -i '' "s/extern const double NSAppKitVersionNumber;/const double NSAppKitVersionNumber = 1343;/g" 3rdparty/hidapi/hidapi/mac/hid.c
 
-rm -rf build
 mkdir build && cd build || exit 1
 
 export MACOSX_DEPLOYMENT_TARGET=14.0
diff --git a/.github/workflows/rpcs3.yml b/.github/workflows/rpcs3.yml
index b351c20c83..e2b430701e 100644
--- a/.github/workflows/rpcs3.yml
+++ b/.github/workflows/rpcs3.yml
@@ -114,20 +114,20 @@ jobs:
           - name: Intel
             build_sh: "arch -X86_64 .ci/build-mac.sh"
             UPLOAD_COMMIT_HASH: 8e21bdbc40711a3fccd18fbf17b742348b0f4281
-            UPLOAD_REPO_FULL_NAME: "rpcs3/rpcs3-binaries-mac"
+            UPLOAD_REPO_FULL_NAME: rpcs3/rpcs3-binaries-mac
           - name: Apple Silicon
-            build_sh: ".ci/build-mac-arm64.sh"
+            build_sh: .ci/build-mac-arm64.sh
             UPLOAD_COMMIT_HASH: 51ae32f468089a8169aaf1567de355ff4a3e0842
-            UPLOAD_REPO_FULL_NAME: "rpcs3/rpcs3-binaries-mac-arm64"
+            UPLOAD_REPO_FULL_NAME: rpcs3/rpcs3-binaries-mac-arm64
     name: RPCS3 Mac ${{ matrix.name }} 
     runs-on: macos-14
     env:
-      CCACHE_DIR: "/tmp/ccache_dir"
+      CCACHE_DIR: /tmp/ccache_dir
       CI_HAS_ARTIFACTS: true
       QT_VER: '6.7.3'
       QT_VER_MAIN: '6'
       LLVM_COMPILER_VER: '19'
-      RELEASE_MESSAGE: "../GitHubReleaseMessage.txt"
+      RELEASE_MESSAGE: ../GitHubReleaseMessage.txt
       UPLOAD_COMMIT_HASH: ${{ matrix.UPLOAD_COMMIT_HASH }}
       UPLOAD_REPO_FULL_NAME: ${{ matrix.UPLOAD_REPO_FULL_NAME }}
     steps:
@@ -141,28 +141,19 @@ jobs:
         with:
           path: ${{ env.CCACHE_DIR }}
           key: ${{ runner.os }}-ccache-${{ matrix.name }}-${{github.run_id}}
-          restore-keys: | 
+          restore-keys: |
             ${{ runner.os }}-ccache-${{ matrix.name }}-
 
-      - name: Setup Homebrew Cache
-        uses: actions/cache@main
-        with:
-          path: "~/Library/Caches/Homebrew"
-          key: ${{ runner.os }}-homebrew-${{ matrix.name }}
-          restore-keys: | 
-            ${{ runner.os }}-homebrew-${{ matrix.name }}
-
       - name: Setup Qt Cache
         uses: actions/cache@main
         with:
-          path: "/tmp/Qt"
+          path: /tmp/Qt
           key: ${{ runner.os }}-qt-${{ matrix.name }}-${{ env.QT_VER }}
-          restore-keys: | 
+          restore-keys: |
             ${{ runner.os }}-qt-${{ matrix.name }}-${{ env.QT_VER }}
 
       - name: Build
-        run: | 
-          ${{ matrix.build_sh }}      
+        run: ${{ matrix.build_sh }}      
 
       - name: Upload artifacts
         uses: actions/upload-artifact@main
@@ -183,11 +174,10 @@ jobs:
         if: |
           github.event_name != 'pull_request' &&
           github.repository == 'RPCS3/rpcs3' &&
-          github.ref == 'refs/heads/master' 
+          github.ref == 'refs/heads/master'
         env:
           RPCS3_TOKEN: ${{ secrets.RPCS3_TOKEN }}
-        run: |
-          .ci/github-upload.sh
+        run: .ci/github-upload.sh
 
   Windows_Build:
     # Only run push event on master branch of main repo, but run all PRs
diff --git a/.vscode/settings.json b/.vscode/settings.json
new file mode 100644
index 0000000000..cddac42ba3
--- /dev/null
+++ b/.vscode/settings.json
@@ -0,0 +1,3 @@
+{
+    "editor.codeLens": false
+}
\ No newline at end of file