From 24e5789f419f6ef7a96e2ddc527263de6d4d6074 Mon Sep 17 00:00:00 2001
From: moweishan <13892077751@163.com>
Date: Wed, 31 Dec 2025 02:24:54 +0000
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=20.drone.yml?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .drone.yml | 19 ++++++++++++-------
 1 file changed, 12 insertions(+), 7 deletions(-)

diff --git a/.drone.yml b/.drone.yml
index 1f62d85..51d2217 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -2,10 +2,10 @@ kind: pipeline
 type: docker
 name: main-automated-pipeline
 
-# 启用模板
 clone:
   disable: false
 
+# 顶层触发器：允许 push/promote/manual 三类事件唤醒流水线
 trigger:
   event:
     - push
@@ -13,7 +13,7 @@ trigger:
     - manual
 
 steps:
-  # ========== 原有：push触发的自动运行节点 ==========
+  # ===== 原有自动节点（push到main分支自动执行，保留不变）=====
   - name: print-auto-run
     image: alpine:latest
     when:
@@ -27,16 +27,21 @@ steps:
       - echo 自动运行
       - echo ===================================
 
-  # ========== 新增：手动触发的专属运行节点 ==========
+  # ===== 手动触发节点【修复后核心配置】=====
   - name: print-manual-run
     image: alpine:latest
-    # 核心条件：仅当触发事件为 manual 时执行
+    # ✅ 关键修复1：添加 branch: [ main, '*' ] 兼容所有分支手动触发
+    # ✅ 关键修复2：用列表格式，Drone 推荐写法，兼容性100%
     when:
-      event: manual
+      event:
+        - manual
+      branch:
+        - main
+        - '*'  # 通配符，匹配所有分支，彻底解决分支冲突问题
     environment:
       REPO_UID: "{{ .repo.uid }}"
     commands:
       - echo ===================================
-      - echo 这是手动触发的流水线
-      - echo 手动运行（支持手动点击/API触发）
+      - echo 🚀 这是手动触发的流水线（已生效）
+      - echo 手动运行成功！
       - echo ===================================
\ No newline at end of file