From 0a72c4da9642c743de497967ffe2eba1849cd4fc Mon Sep 17 00:00:00 2001
From: erduotong <3135351980@qq.com>
Date: Fri, 14 Mar 2025 06:53:59 +0800
Subject: [PATCH 1/2] Revert "fix(release): exclude pnpm-lock.yaml from git add
 in release preparation workflow"

This reverts commit b4f5a73398e5be8b08703be965c751e7bb49ad16.
---
 .github/workflows/Release Preparation.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/Release Preparation.yml b/.github/workflows/Release Preparation.yml
index a9ede49..ca4c132 100644
--- a/.github/workflows/Release Preparation.yml	
+++ b/.github/workflows/Release Preparation.yml	
@@ -50,7 +50,7 @@ jobs:
         run: node .github/scripts/updateChangelog.js --version=${{ env.VERSION }}
       - name: 更新提交
         run: |
-          git add . ':!pnpm-lock.yaml'
+          git add .
           git commit -m "chore: 更新版本号和更新日志 ${{ env.VERSION }}"
           git push origin HEAD
 

From f9c15896dde16820ebdc4385e3d580d244f5f6e1 Mon Sep 17 00:00:00 2001
From: erduotong <3135351980@qq.com>
Date: Fri, 14 Mar 2025 06:58:02 +0800
Subject: [PATCH 2/2] feat(build): enhance nightly build and release
 preparation workflows with pnpm and Rust setup

---
 .github/workflows/Nightly Build.yml       | 20 +++++++++++++++--
 .github/workflows/Release Preparation.yml |  2 +-
 .github/workflows/Setup Build Env.yml     | 27 -----------------------
 3 files changed, 19 insertions(+), 30 deletions(-)
 delete mode 100644 .github/workflows/Setup Build Env.yml

diff --git a/.github/workflows/Nightly Build.yml b/.github/workflows/Nightly Build.yml
index 1c62f08..8217f8f 100644
--- a/.github/workflows/Nightly Build.yml	
+++ b/.github/workflows/Nightly Build.yml	
@@ -14,8 +14,24 @@ jobs:
         uses: actions/checkout@v4
         with:
           ref: develop
-      - name: setup build env
-        uses: ./.github/workflows/Setup Build Env.yml
+      - uses: pnpm/action-setup@v4
+        name: Install pnpm
+        with:
+          version: 8
+          run_install: false
+      - name: setup Node
+        uses: actions/setup-node@v4
+        with:
+          node-version: lts/*
+          cache: "pnpm"
+      - name: install dependencies
+        run: pnpm install
+      - name: install Rust stable
+        uses: dtolnay/rust-toolchain@stable
+      - name: Rust cache
+        uses: swatinem/rust-cache@v2
+        with:
+          workspaces: "./App/src-tauri -> target"
       # 数据处理
       - name: set loglevel
         run: node .github/scripts/processLoglevelToTrace.js
diff --git a/.github/workflows/Release Preparation.yml b/.github/workflows/Release Preparation.yml
index ca4c132..a9ede49 100644
--- a/.github/workflows/Release Preparation.yml	
+++ b/.github/workflows/Release Preparation.yml	
@@ -50,7 +50,7 @@ jobs:
         run: node .github/scripts/updateChangelog.js --version=${{ env.VERSION }}
       - name: 更新提交
         run: |
-          git add .
+          git add . ':!pnpm-lock.yaml'
           git commit -m "chore: 更新版本号和更新日志 ${{ env.VERSION }}"
           git push origin HEAD
 
diff --git a/.github/workflows/Setup Build Env.yml b/.github/workflows/Setup Build Env.yml
deleted file mode 100644
index 710c902..0000000
--- a/.github/workflows/Setup Build Env.yml	
+++ /dev/null
@@ -1,27 +0,0 @@
-name: 设置构建环境
-description: 设置构建环境
-runs:
-  using: "composite"
-  steps:
-    - uses: pnpm/action-setup@v4
-      with:
-        version: 10
-        run_install: false
-
-    - name: setup Node
-      uses: actions/setup-node@v4
-      with:
-        node-version: lts/*
-        cache: "pnpm"
-
-    - name: install dependencies
-      run: pnpm install
-      shell: bash
-
-    - name: install Rust stable
-      uses: dtolnay/rust-toolchain@stable
-
-    - name: Rust cache
-      uses: swatinem/rust-cache@v2
-      with:
-        workspaces: "./App/src-tauri -> target"
\ No newline at end of file