diff --git a/.github/build-for-linux/build.sh b/.github/build-for-linux/build.sh index 6389453..101ba27 100644 --- a/.github/build-for-linux/build.sh +++ b/.github/build-for-linux/build.sh @@ -2,7 +2,7 @@ pnpm install pnpm check $INPUT_TARGET sed -i "s/#openssl/openssl={version=\"0.10\",features=[\"vendored\"]}/g" src-tauri/Cargo.toml if [ "$INPUT_TARGET" = "x86_64-unknown-linux-gnu" ]; then - pnpm build --target $INPUT_TARGET + cargo tauri build --target $INPUT_TARGET else - pnpm build --target $INPUT_TARGET -b deb + cargo tauri build --target $INPUT_TARGET -b deb fi diff --git a/.github/build-for-linux/entrypoint.sh b/.github/build-for-linux/entrypoint.sh index c073603..c23f621 100644 --- a/.github/build-for-linux/entrypoint.sh +++ b/.github/build-for-linux/entrypoint.sh @@ -5,6 +5,8 @@ tar -Jxvf ./node-v20.10.0-linux-x64.tar.xz export PATH=$(pwd)/node-v20.10.0-linux-x64/bin:$PATH npm install pnpm -g +cargo install --git https://github.com/tauri-apps/tauri --branch 1.x tauri-cli + rustup target add "$INPUT_TARGET" if [ "$INPUT_TARGET" = "x86_64-unknown-linux-gnu" ]; then diff --git a/.github/workflows/alpha.yml b/.github/workflows/alpha.yml index f393dcc..ad19f61 100644 --- a/.github/workflows/alpha.yml +++ b/.github/workflows/alpha.yml @@ -43,6 +43,9 @@ jobs: with: workspaces: src-tauri + - name: Install Tauri CLI + run: cargo install --git https://github.com/tauri-apps/tauri --branch 1.x tauri-cli + - name: Install Node uses: actions/setup-node@v4 with: @@ -72,7 +75,7 @@ jobs: releaseBody: "More new features are now supported." releaseDraft: false prerelease: true - tauriScript: pnpm + tauriScript: cargo tauri args: --target ${{ matrix.target }} - name: Portable Bundle @@ -163,6 +166,9 @@ jobs: with: workspaces: src-tauri + - name: Install Tauri CLI + run: cargo install --git https://github.com/tauri-apps/tauri --branch 1.x tauri-cli + - name: Install Node uses: actions/setup-node@v4 with: @@ -195,7 +201,7 @@ jobs: TAURI_PRIVATE_KEY: ${{ secrets.TAURI_PRIVATE_KEY }} TAURI_KEY_PASSWORD: ${{ secrets.TAURI_KEY_PASSWORD }} with: - tauriScript: pnpm + tauriScript: cargo tauri args: --target ${{ matrix.target }} - name: Rename diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 5159687..0493daf 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -40,6 +40,9 @@ jobs: with: workspaces: src-tauri + - name: Install Tauri CLI + run: cargo install --git https://github.com/tauri-apps/tauri --branch 1.x tauri-cli + - name: Install Node uses: actions/setup-node@v4 with: @@ -67,7 +70,7 @@ jobs: tagName: v__VERSION__ releaseName: "Clash Verge Rev v__VERSION__" releaseBody: "More new features are now supported." - tauriScript: pnpm + tauriScript: cargo tauri args: --target ${{ matrix.target }} - name: Portable Bundle @@ -155,6 +158,9 @@ jobs: with: workspaces: src-tauri + - name: Install Tauri CLI + run: cargo install --git https://github.com/tauri-apps/tauri --branch 1.x tauri-cli + - name: Install Node uses: actions/setup-node@v4 with: @@ -187,7 +193,7 @@ jobs: TAURI_PRIVATE_KEY: ${{ secrets.TAURI_PRIVATE_KEY }} TAURI_KEY_PASSWORD: ${{ secrets.TAURI_KEY_PASSWORD }} with: - tauriScript: pnpm + tauriScript: cargo tauri args: --target ${{ matrix.target }} - name: Rename diff --git a/src-tauri/Cargo.lock b/src-tauri/Cargo.lock index 4bd5f69..8337d3b 100644 --- a/src-tauri/Cargo.lock +++ b/src-tauri/Cargo.lock @@ -2301,7 +2301,7 @@ dependencies = [ "httpdate", "itoa 1.0.11", "pin-project-lite", - "socket2 0.5.7", + "socket2 0.4.10", "tokio", "tower-service", "tracing", @@ -5381,8 +5381,7 @@ checksum = "e1fc403891a21bcfb7c37834ba66a547a8f402146eba7265b5a6d88059c9ff2f" [[package]] name = "tauri" version = "1.6.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "67c7177b6be45bbb875aa239578f5adc982a1b3d5ea5b315ccd100aeb0043374" +source = "git+https://github.com/Pylogmon/tauri?branch=1.x#9c0b64965560b28c3d06963494a3e0d2e1bae9f4" dependencies = [ "anyhow", "base64 0.21.7", @@ -5445,8 +5444,7 @@ dependencies = [ [[package]] name = "tauri-build" version = "1.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ab30cba12974d0f9b09794f61e72cad6da2142d3ceb81e519321bab86ce53312" +source = "git+https://github.com/Pylogmon/tauri?branch=1.x#9c0b64965560b28c3d06963494a3e0d2e1bae9f4" dependencies = [ "anyhow", "cargo_toml", @@ -5464,8 +5462,7 @@ dependencies = [ [[package]] name = "tauri-codegen" version = "1.4.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c3a1d90db526a8cdfd54444ad3f34d8d4d58fa5c536463915942393743bd06f8" +source = "git+https://github.com/Pylogmon/tauri?branch=1.x#9c0b64965560b28c3d06963494a3e0d2e1bae9f4" dependencies = [ "base64 0.21.7", "brotli", @@ -5490,8 +5487,7 @@ dependencies = [ [[package]] name = "tauri-macros" version = "1.4.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a582d75414250122e4a597b9dd7d3c910a2c77906648fc2ac9353845ff0feec" +source = "git+https://github.com/Pylogmon/tauri?branch=1.x#9c0b64965560b28c3d06963494a3e0d2e1bae9f4" dependencies = [ "heck 0.5.0", "proc-macro2", @@ -5504,8 +5500,7 @@ dependencies = [ [[package]] name = "tauri-runtime" version = "0.14.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cd7ffddf36d450791018e63a3ddf54979b9581d9644c584a5fb5611e6b5f20b4" +source = "git+https://github.com/Pylogmon/tauri?branch=1.x#9c0b64965560b28c3d06963494a3e0d2e1bae9f4" dependencies = [ "gtk", "http 0.2.12", @@ -5525,8 +5520,7 @@ dependencies = [ [[package]] name = "tauri-runtime-wry" version = "0.14.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1989b3b4d611f5428b3414a4abae6fa6df30c7eb8ed33250ca90a5f7e5bb3655" +source = "git+https://github.com/Pylogmon/tauri?branch=1.x#9c0b64965560b28c3d06963494a3e0d2e1bae9f4" dependencies = [ "arboard", "cocoa 0.24.1", @@ -5546,8 +5540,7 @@ dependencies = [ [[package]] name = "tauri-utils" version = "1.5.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "450b17a7102e5d46d4bdabae0d1590fd27953e704e691fc081f06c06d2253b35" +source = "git+https://github.com/Pylogmon/tauri?branch=1.x#9c0b64965560b28c3d06963494a3e0d2e1bae9f4" dependencies = [ "brotli", "ctor", diff --git a/src-tauri/Cargo.toml b/src-tauri/Cargo.toml index 054a856..9b3ee09 100644 --- a/src-tauri/Cargo.toml +++ b/src-tauri/Cargo.toml @@ -10,7 +10,7 @@ edition = "2021" build = "build.rs" [build-dependencies] -tauri-build = { version = "1", features = [] } +tauri-build = { git="https://github.com/Pylogmon/tauri",branch = "1.x", features = [] } [dependencies] warp = "0.3" @@ -37,8 +37,7 @@ serde = { version = "1.0", features = ["derive"] } reqwest = { version = "0.12", features = ["json", "rustls-tls"] } sysproxy = { git="https://github.com/zzzgydi/sysproxy-rs", branch = "main" } auto-launch = { git="https://github.com/zzzgydi/auto-launch", branch = "main" } -tauri = { version = "1.6", features = [ "fs-read-file", "fs-exists", "path-all", "protocol-asset", "dialog-open", "notification-all", "icon-png", "icon-ico", "clipboard-all", "global-shortcut-all", "process-all", "shell-all", "system-tray", "updater", "window-all", "devtools"] } - +tauri = { git="https://github.com/Pylogmon/tauri",branch = "1.x", features = [ "fs-read-file", "fs-exists", "path-all", "protocol-asset", "dialog-open", "notification-all", "icon-png", "icon-ico", "clipboard-all", "global-shortcut-all", "process-all", "shell-all", "system-tray", "updater", "window-all", "devtools"] } [target.'cfg(windows)'.dependencies] runas = "=1.2.0" deelevate = "0.2.0"