From d5a7a6718242d6d83ec2c35ee61b81a9dd6b42d9 Mon Sep 17 00:00:00 2001
From: jubaoliang <jubaoliang@tencent.com>
Date: Thu, 27 Aug 2026 09:56:58 +0000
Subject: [PATCH] ci: cascade desktop package on release and stop all-branch
 builds

Auto Tag dispatches Octop Desktop with Release/Docker. Restrict
octop-desktop.yml to v* tags + workflow_dispatch only.

Co-authored-by: Cursor <cursoragent@cursor.com>
---
 .github/workflows/auto-tag-on-release.yml | 9 +++++++--
 .github/workflows/octop-desktop.yml       | 9 ++++++---
 2 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/auto-tag-on-release.yml b/.github/workflows/auto-tag-on-release.yml
index 08e2f254..3052b34f 100644
--- a/.github/workflows/auto-tag-on-release.yml
+++ b/.github/workflows/auto-tag-on-release.yml
@@ -64,8 +64,10 @@ jobs:
           git push origin "$tag"
 
       # GITHUB_TOKEN tag pushes do not cascade to other workflows. Explicitly
-      # dispatch Release / Docker Publish (workflow_dispatch is exempt).
-      - name: Trigger Release and Docker Publish
+      # dispatch Release / Docker Publish / Desktop Package (workflow_dispatch
+      # is exempt). Desktop builds in parallel; its release job upserts zips
+      # onto the same v* GitHub Release.
+      - name: Trigger Release, Docker Publish, and Desktop Package
         if: steps.check_tag.outputs.should_publish == 'true'
         env:
           GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
@@ -73,3 +75,6 @@ jobs:
           tag="${{ steps.version.outputs.tag }}"
           gh workflow run release.yml --ref "$tag"
           gh workflow run docker-publish.yml --ref "$tag"
+          gh workflow run octop-desktop.yml --ref "$tag" \
+            -f platforms=all \
+            -f attach_release=true
diff --git a/.github/workflows/octop-desktop.yml b/.github/workflows/octop-desktop.yml
index aae3929b..4a453911 100644
--- a/.github/workflows/octop-desktop.yml
+++ b/.github/workflows/octop-desktop.yml
@@ -1,11 +1,14 @@
 name: Octop Desktop Package
 
+# 正式发版：Auto Tag 在打 v* 后与 Release / Docker Publish 一并 dispatch（GITHUB_TOKEN
+# 打的 tag 不会触发 push workflow）。产物由本 workflow 的 release job upsert 到同一
+# GitHub Release。workflow_dispatch 保留给手工补包 / 按平台重跑。
+# 不要对任意分支 push 跑六平台矩阵。
+
 on:
   push:
     tags:
-      - "*"
-    branches:
-      - "*"
+      - "v*"
   workflow_dispatch:
     inputs:
       platforms: