From f044c7997d631d918d40d5f3d2c7843da4f3b39e Mon Sep 17 00:00:00 2001
From: starknt <1431880400@qq.com>
Date: Fri, 22 Nov 2024 23:13:10 +0800
Subject: [PATCH] fix: pnpm executable not found

---
 .github/workflows/build-and-release.yml |  6 +++---
 .github/workflows/npm-run-electron.yml  | 25 +++++++++++++++++++++----
 .github/workflows/test-and-upload.yml   |  6 +++---
 3 files changed, 27 insertions(+), 10 deletions(-)

diff --git a/.github/workflows/build-and-release.yml b/.github/workflows/build-and-release.yml
index 59750da..145f903 100644
--- a/.github/workflows/build-and-release.yml
+++ b/.github/workflows/build-and-release.yml
@@ -24,6 +24,9 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v4.1.7
 
+      - name: Setup pnpm
+        uses: pnpm/action-setup@v4
+
       - name: 'Setup Node.js "${{ matrix.node }}.x" environment'
         uses: actions/setup-node@v4
         with:
@@ -31,9 +34,6 @@ jobs:
           registry-url: https://npm.pkg.github.com/
           cache: pnpm
 
-      - name: Setup pnpm
-        uses: pnpm/action-setup@v4
-
       - name: Setup Python environment (Mac) Because of electron-builder install-app-deps requires Python setup tools
         if: matrix.os == 'macos'
         uses: actions/setup-python@v5
diff --git a/.github/workflows/npm-run-electron.yml b/.github/workflows/npm-run-electron.yml
index 52f838f..e656bf6 100644
--- a/.github/workflows/npm-run-electron.yml
+++ b/.github/workflows/npm-run-electron.yml
@@ -23,14 +23,15 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v4.1.7
 
+      - name: Setup pnpm
+        uses: pnpm/action-setup@v4
+
       - name: 'Setup Node.js "${{ matrix.node }}.x" environment'
         uses: actions/setup-node@v4
         with:
           node-version: ${{ matrix.node }}
           registry-url: https://npm.pkg.github.com/
-
-      - name: Setup pnpm
-        uses: pnpm/action-setup@v4
+          cache: pnpm
 
       - name: Setup Python environment (Mac) Because of electron-builder install-app-deps requires Python setup tools
         if: matrix.os == 'macos'
@@ -68,6 +69,22 @@ jobs:
           echo "--------------------";
           python --version;
 
+      - name: Setup electron cahce
+        uses: actions/cache@v4
+        with:
+          path: ${{ env.HOME }}/.cache/electron
+          key: ${{ runner.os }}-electron-cache-${{ hashFiles('**/pnpm-lock.yaml') }}
+          restore-keys: |
+            ${{ runner.os }}-electron-cache-
+
+      - name: Setup electron-builder cahce
+        uses: actions/cache@v4
+        with:
+          path: ${{ env.HOME }}/.cache/electron-builder
+          key: ${{ runner.os }}-electron-builder-cache-${{ hashFiles('**/pnpm-lock.yaml') }}
+          restore-keys: |
+            ${{ runner.os }}-electron-builder-cache-
+
       - name: pnpm install
         run: |
           echo "======================================================================";
@@ -78,7 +95,7 @@ jobs:
           echo "--------------------";
           pnpm install;
 
-      - name: 'npm run electron'
+      - name: npm run electron
         run: |
           echo "======================================================================";
           echo "cd packages/gui";
diff --git a/.github/workflows/test-and-upload.yml b/.github/workflows/test-and-upload.yml
index c7cc1a5..a97e1bd 100644
--- a/.github/workflows/test-and-upload.yml
+++ b/.github/workflows/test-and-upload.yml
@@ -27,6 +27,9 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v4.1.7
 
+      - name: Setup pnpm
+        uses: pnpm/action-setup@v4
+
       - name: 'Setup Node.js "${{ matrix.node }}.x" environment'
         uses: actions/setup-node@v4
         with:
@@ -34,9 +37,6 @@ jobs:
           registry-url: https://npm.pkg.github.com/
           cache: pnpm
 
-      - name: Setup pnpm
-        uses: pnpm/action-setup@v4
-
       - name: Setup Python environment (Mac) Because of electron-builder install-app-deps requires Python setup tools
         if: matrix.os == 'macos'
         uses: actions/setup-python@v5