From 671691992c07de044440be2fffe5efdfbdbcd45c Mon Sep 17 00:00:00 2001
From: Tw93 <tw93@qq.com>
Date: Sun, 7 Sep 2025 00:37:46 +0800
Subject: [PATCH] :bug: Fix release dependency version

---
 .github/actions/setup-env/action.yml | 8 +++++---
 .github/workflows/single-app.yaml    | 2 +-
 Dockerfile                           | 6 +++---
 dist/cli.js                          | 2 +-
 src-tauri/Cargo.toml                 | 2 +-
 5 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/.github/actions/setup-env/action.yml b/.github/actions/setup-env/action.yml
index b03f50c..73a6e71 100644
--- a/.github/actions/setup-env/action.yml
+++ b/.github/actions/setup-env/action.yml
@@ -91,12 +91,13 @@ runs:
       uses: dtolnay/rust-toolchain@stable
       with:
         toolchain: stable
-        target: x86_64-apple-darwin
 
     - name: Add macOS universal targets
       if: env.SETUP_RUST == 'true' && runner.os == 'macOS'
       shell: bash
-      run: rustup target add aarch64-apple-darwin
+      run: |
+        rustup target add x86_64-apple-darwin
+        rustup target add aarch64-apple-darwin
 
     # 4. System Dependencies
     - name: Install Ubuntu dependencies
@@ -107,7 +108,8 @@ runs:
           libdbus-1-dev libsoup-3.0-dev libjavascriptcoregtk-4.1-dev libwebkit2gtk-4.1-dev
           build-essential curl wget file libxdo-dev libssl-dev libgtk-3-dev 
           libayatana-appindicator3-dev librsvg2-dev gnome-video-effects gnome-video-effects-extra
-          libglib2.0-dev pkg-config
+          libglib2.0-dev libglib2.0-dev-bin libgio2.0-cil-dev libgirepository1.0-dev 
+          pkg-config
         version: 1.1
 
     - name: Install WIX Toolset
diff --git a/.github/workflows/single-app.yaml b/.github/workflows/single-app.yaml
index 793fcb4..1746d3f 100644
--- a/.github/workflows/single-app.yaml
+++ b/.github/workflows/single-app.yaml
@@ -76,7 +76,7 @@ jobs:
       - name: Setup Node.js Environment
         uses: ./.github/actions/setup-env
         with:
-          mode: node-only
+          mode: ${{ matrix.build == 'linux' && 'full' || 'node-only' }}
 
       - name: Rust cache restore
         uses: actions/cache/restore@v4.2.0
diff --git a/Dockerfile b/Dockerfile
index 4e4b6dd..d0f5c6a 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,6 +1,6 @@
 # syntax=docker/dockerfile:1.4
-# Cargo build stage - Updated to Rust 1.82 for zerovec dependency compatibility
-FROM rust:1.82-slim AS cargo-builder
+# Cargo build stage - Updated to Rust 1.85 for edition2024 support
+FROM rust:1.85-slim AS cargo-builder
 # Install Rust dependencies
 RUN --mount=type=cache,target=/var/cache/apt \
     --mount=type=cache,target=/usr/local/cargo/registry \
@@ -27,7 +27,7 @@ RUN --mount=type=cache,target=/usr/local/cargo/registry \
 RUN ls -la /cargo-cache/registry && ls -la /cargo-cache/git && rm -rfd /cargo-cache/registry/src
 
 # Main build stage
-FROM rust:1.82-slim AS builder
+FROM rust:1.85-slim AS builder
 # Install Rust dependencies
 RUN --mount=type=cache,target=/var/cache/apt \
     --mount=type=cache,target=/usr/local/cargo/registry \
diff --git a/dist/cli.js b/dist/cli.js
index e72cb50..42fbb08 100755
--- a/dist/cli.js
+++ b/dist/cli.js
@@ -1674,7 +1674,7 @@ program
         if (option.flags === '-v, --version')
             return '';
         return option.description;
-    }
+    },
 })
     .action(async (url, options) => {
     await checkUpdateTips();
diff --git a/src-tauri/Cargo.toml b/src-tauri/Cargo.toml
index b58196b..8dd473b 100644
--- a/src-tauri/Cargo.toml
+++ b/src-tauri/Cargo.toml
@@ -6,7 +6,7 @@ authors = ["Tw93"]
 license = "MIT"
 repository = "https://github.com/tw93/Pake"
 edition = "2021"
-rust-version = "1.78.0"
+rust-version = "1.85.0"
 
 [lib]
 name = "app_lib"