From 6017423a4905663cdb72ce3b479fd8020831c948 Mon Sep 17 00:00:00 2001 From: Tunglies <77394545+Tunglies@users.noreply.github.com> Date: Sat, 8 Nov 2025 18:31:22 +0800 Subject: [PATCH] chore: update version to 2.4.3-rc and enhance release notes --- .github/workflows/release.yml | 17 +++++++++++++---- UPDATELOG.md | 5 ++++- package.json | 2 +- src-tauri/Cargo.lock | 2 +- src-tauri/Cargo.toml | 2 +- src-tauri/tauri.conf.json | 2 +- 6 files changed, 21 insertions(+), 9 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 7f74de0d5..0385c16c9 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -5,6 +5,7 @@ on: # ! 不再使用 workflow_dispatch 触发。 # workflow_dispatch: push: + # -rc tag 时预览发布, 跳过 telegram 通知、跳过 winget 提交、跳过 latest.json 文件更新 tags: - "v*.*.*" permissions: write-all @@ -143,7 +144,7 @@ jobs: name: "Clash Verge Rev ${{ env.TAG_NAME }}" body_path: release.txt draft: false - prerelease: false + prerelease: ${{ contains(github.ref_name, '-rc') }} token: ${{ secrets.GITHUB_TOKEN }} # generate_release_notes: true @@ -213,7 +214,8 @@ jobs: pnpm run prebuild ${{ matrix.target }} - name: Tauri build - uses: tauri-apps/tauri-action@v0 + # 上游 5.24 修改了 latest.json 的生成逻辑,且依赖 tauri-plugin-update 2.10.0 暂未发布,故锁定在 0.5.23 版本 + uses: tauri-apps/tauri-action@v0.5.23 env: NODE_OPTIONS: "--max_old_space_size=4096" GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} @@ -230,7 +232,7 @@ jobs: releaseName: "Clash Verge Rev ${{ github.ref_name }}" releaseBody: "Draft release, will be updated later." releaseDraft: true - prerelease: false + prerelease: ${{ contains(github.ref_name, '-rc') }} tauriScript: pnpm args: --target ${{ matrix.target }} includeUpdaterJson: true @@ -354,6 +356,7 @@ jobs: name: "Clash Verge Rev v${{env.VERSION}}" body: "See release notes for detailed changelog." token: ${{ secrets.GITHUB_TOKEN }} + prerelease: ${{ contains(github.ref_name, '-rc') }} files: | src-tauri/target/${{ matrix.target }}/release/bundle/deb/*.deb src-tauri/target/${{ matrix.target }}/release/bundle/rpm/*.rpm @@ -409,7 +412,8 @@ jobs: - name: Tauri build id: build - uses: tauri-apps/tauri-action@v0 + # 上游 5.24 修改了 latest.json 的生成逻辑,且依赖 tauri-plugin-update 2.10.0 暂未发布,故锁定在 0.5.23 版本 + uses: tauri-apps/tauri-action@v0.5.23 env: NODE_OPTIONS: "--max_old_space_size=4096" GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} @@ -446,6 +450,7 @@ jobs: name: "Clash Verge Rev v${{steps.build.outputs.appVersion}}" body: "See release notes for detailed changelog." token: ${{ secrets.GITHUB_TOKEN }} + prerelease: ${{ contains(github.ref_name, '-rc') }} files: src-tauri/target/${{ matrix.target }}/release/bundle/nsis/*setup* - name: Portable Bundle @@ -454,6 +459,7 @@ jobs: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} release-update: + if: ${{ !contains(github.ref_name, '-rc') }} name: Release Update runs-on: ubuntu-latest needs: [update_tag] @@ -480,6 +486,7 @@ jobs: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} release-update-for-fixed-webview2: + if: ${{ !contains(github.ref_name, '-rc') }} runs-on: ubuntu-latest needs: [update_tag] steps: @@ -505,6 +512,7 @@ jobs: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} submit-to-winget: + if: ${{ !contains(github.ref_name, '-rc') }} name: Submit to Winget runs-on: ubuntu-latest needs: [update_tag, release-update] @@ -528,6 +536,7 @@ jobs: token: ${{ secrets.WINGET_TOKEN }} notify-telegram: + if: ${{ !contains(github.ref_name, '-rc') }} name: Notify Telegram runs-on: ubuntu-latest needs: diff --git a/UPDATELOG.md b/UPDATELOG.md index aff9b85b6..53afd8867 100644 --- a/UPDATELOG.md +++ b/UPDATELOG.md @@ -1,6 +1,9 @@ ## v2.4.3 -感谢 @Slinetrac, @oomeow, @Lythrilla, @Dragon1573 的出色贡献 +**发行代号:澜** +代号释义:澜象征平稳与融合,本次版本聚焦稳定性、兼容性、性能与体验优化,全面提升整体可靠性。 + +特别感谢 @Slinetrac, @oomeow, @Lythrilla, @Dragon1573 的出色贡献 ### 🐞 修复问题 diff --git a/package.json b/package.json index 86c39afab..a86df00e7 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "clash-verge", - "version": "2.4.3", + "version": "2.4.3-rc", "license": "GPL-3.0-only", "scripts": { "prepare": "husky || true", diff --git a/src-tauri/Cargo.lock b/src-tauri/Cargo.lock index 993563eea..696f091ba 100644 --- a/src-tauri/Cargo.lock +++ b/src-tauri/Cargo.lock @@ -1095,7 +1095,7 @@ checksum = "a1d728cc89cf3aee9ff92b05e62b19ee65a02b5702cff7d5a377e32c6ae29d8d" [[package]] name = "clash-verge" -version = "2.4.3" +version = "2.4.3-rc" dependencies = [ "aes-gcm", "anyhow", diff --git a/src-tauri/Cargo.toml b/src-tauri/Cargo.toml index 6311a8083..bc36d2b6a 100755 --- a/src-tauri/Cargo.toml +++ b/src-tauri/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "clash-verge" -version = "2.4.3" +version = "2.4.3-rc" description = "clash verge" authors = ["zzzgydi", "Tunglies", "wonfen", "MystiPanda"] license = "GPL-3.0-only" diff --git a/src-tauri/tauri.conf.json b/src-tauri/tauri.conf.json index 8e2c72cef..3d0c18809 100755 --- a/src-tauri/tauri.conf.json +++ b/src-tauri/tauri.conf.json @@ -1,5 +1,5 @@ { - "version": "2.4.3", + "version": "2.4.3-rc", "$schema": "../node_modules/@tauri-apps/cli/config.schema.json", "bundle": { "active": true,