From 266510d8bed3c5e76195e8e659e9948d6e621228 Mon Sep 17 00:00:00 2001 From: Fox_block Date: Sat, 21 Mar 2026 17:51:39 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=89=80=E6=9C=89=E5=B9=B3?= =?UTF-8?q?=E5=8F=B0=E7=9A=84=E6=9E=84=E5=BB=BA=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit macOS: - 添加 x86_64-apple-darwin target 到 Rust 安装步骤 Linux: - 将 libwebkit2gtk-4.0-dev 更新为 libwebkit2gtk-4.1-dev(新版本) Android: - 修正 Tauri Android 构建命令的 target 参数 - 使用简化的架构名称(aarch64, armv7, x86_64) Windows: - 修复 devtools 相关的编译错误 - 将 devtools 调用限制在 debug_assertions 模式下 - 在 release 模式下不调用 devtools 方法(这些方法在 release 中不可用) --- .github/workflows/build.yml | 12 ++++++++---- src-tauri/src/commands/window.rs | 2 +- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 9b0c362..abb5524 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -74,6 +74,8 @@ jobs: - name: 安装 Rust uses: dtolnay/rust-toolchain@stable + with: + targets: x86_64-pc-windows-msvc - name: 应用版本号 run: node scripts/ci/apply-version.mjs ${{ needs.parse.outputs.version }} @@ -106,6 +108,8 @@ jobs: - name: 安装 Rust uses: dtolnay/rust-toolchain@stable + with: + targets: x86_64-apple-darwin - name: 应用版本号 run: node scripts/ci/apply-version.mjs ${{ needs.parse.outputs.version }} @@ -142,7 +146,7 @@ jobs: - name: 安装系统依赖 run: | sudo apt-get update - sudo apt-get install -y libgtk-3-dev libwebkit2gtk-4.0-dev libappindicator3-dev librsvg2-dev patchelf + sudo apt-get install -y libgtk-3-dev libwebkit2gtk-4.1-dev libappindicator3-dev librsvg2-dev patchelf - name: 应用版本号 run: node scripts/ci/apply-version.mjs ${{ needs.parse.outputs.version }} @@ -196,13 +200,13 @@ jobs: run: pnpm install --frozen-lockfile - name: 构建 Android(ARM64) - run: pnpm tauri android build --target aarch64-linux-android + run: pnpm tauri android build --target aarch64 - name: 构建 Android(ARMv7) - run: pnpm tauri android build --target armv7-linux-androideabi + run: pnpm tauri android build --target armv7 - name: 构建 Android(x86_64) - run: pnpm tauri android build --target x86_64-linux-android + run: pnpm tauri android build --target x86_64 - uses: actions/upload-artifact@v4 with: diff --git a/src-tauri/src/commands/window.rs b/src-tauri/src/commands/window.rs index abf21e8..125d175 100644 --- a/src-tauri/src/commands/window.rs +++ b/src-tauri/src/commands/window.rs @@ -100,7 +100,7 @@ pub async fn toggle_devtools( let _ = app; } - #[cfg(desktop)] + #[cfg(debug_assertions)] if let Some(window) = app.get_webview_window("main") { if window.is_devtools_open() { window.close_devtools();