xiaoxia/xiaoxia-saas
1
0
Fork 0
Code Issues 11 Pull Requests 3 Actions Packages Projects Releases 7 Wiki Activity

fix(ci): push触发只保留main/develop，根治PR双触发重复run #425

Merged
xiaoxia merged 1 commits from fix/ci-dual-trigger-dedup into develop 2026-07-16 22:18:48 +08:00
Conversation 1 Commits 1 Files Changed 2
-22
xiaoxia commented 2026-07-16 22:01:26 +08:00
Owner
Copy Link
Copy Source

问题

PR分支push代码时，同时触发 on.push 和 on.pull_request 两个事件，产生重复run，浪费runner资源。

方案A（根治）

  • push.branches 移除所有 feature/feat/bugfix/fix/hotfix/release/refactor/perf/docs/chore/ci 等通配符分支
  • 只保留 main 和 develop 的push触发
  • PR分支的CI完全靠 pull_request 事件触发，不再重复

影响

场景 之前 之后
push到feature分支（无PR） 触发 不触发
push到有PR的feature分支 触发2次（重复） 触发1次（仅PR）
push到develop/main 触发 触发（不变）
新建/更新PR 触发 触发（不变）
push tag（发版） 触发 触发（不变）
手动触发 触发 触发（不变）

验证

  • push到本分支（fix/开头），确认不再触发push事件的CI
  • 本PR的CI正常通过pull_request触发
  • develop合并后，push到develop仍能触发全量CI
## 问题 PR分支push代码时，同时触发 `on.push` 和 `on.pull_request` 两个事件，产生重复run，浪费runner资源。 ## 方案A（根治） - `push.branches` 移除所有 feature/feat/bugfix/fix/hotfix/release/refactor/perf/docs/chore/ci 等通配符分支 - 只保留 `main` 和 `develop` 的push触发 - PR分支的CI完全靠 `pull_request` 事件触发，不再重复 ## 影响 | 场景 | 之前 | 之后 | |------|------|------| | push到feature分支（无PR） | 触发 | 不触发 | | push到有PR的feature分支 | 触发2次（重复） | 触发1次（仅PR） | | push到develop/main | 触发 | 触发（不变） | | 新建/更新PR | 触发 | 触发（不变） | | push tag（发版） | 触发 | 触发（不变） | | 手动触发 | 触发 | 触发（不变） | ## 验证 - [ ] push到本分支（fix/开头），确认不再触发push事件的CI - [ ] 本PR的CI正常通过pull_request触发 - [ ] develop合并后，push到develop仍能触发全量CI
xiaoxia added 1 commit 2026-07-16 22:01:26 +08:00
fix(ci): push触发只保留main/develop，根治PR双触发重复run
CI Build & Deploy Pipeline / Build Staging API Image (pull_request) Has been skipped
Details
CI Build & Deploy Pipeline / Build Staging Web Image (pull_request) Has been skipped
Details
CI Build & Deploy Pipeline / Build Staging Worker Image (pull_request) Has been skipped
Details
CI Build & Deploy Pipeline / Build Production API Image (pull_request) Has been skipped
Details
CI Build & Deploy Pipeline / Deploy Staging (Watchtower auto-deploy) (pull_request) Has been skipped
Details
CI Build & Deploy Pipeline / Build Production Web Image (pull_request) Has been skipped
Details
CI Build & Deploy Pipeline / Staging E2E Tests (pull_request) Has been skipped
Details
CI Build & Deploy Pipeline / Build Production Worker Image (pull_request) Has been skipped
Details
CI Build & Deploy Pipeline / Staging API Integration Tests (pull_request) Has been skipped
Details
CI Build & Deploy Pipeline / Deploy Production (pull_request) Has been skipped
Details
CI/CD Pipeline / Check if frontend-only change (pull_request) Successful in 5s
Details
CI Build & Deploy Pipeline / Production Browser E2E (pull_request) Has been skipped
Details
CI/CD Pipeline / Frontend Lint (pull_request) Successful in 52s
Details
CI/CD Pipeline / Unit Tests (pull_request) Successful in 2m33s
Details
CI/CD Pipeline / Validate Code Quality And Tests (pull_request) Successful in 3m4s
Details
CI/CD Pipeline / Integration Tests (pull_request) Successful in 1m24s
Details
66155cea68 
- push.branches移除所有feature/feat/bugfix/fix等通配符分支
- PR分支CI完全靠pull_request触发，不再重复触发
- push到main/develop仍正常触发（合并后全量CI + 发版）
- tags和workflow_dispatch保持不变
auto-approve-bot approved these changes 2026-07-16 22:08:11 +08:00
auto-approve-bot left a comment
Collaborator
Copy Link
Copy Source

CI全绿，自动审批通过。

CI全绿，自动审批通过。
xiaoxia merged commit ac2662b693 into develop 2026-07-16 22:18:48 +08:00
xiaoxia deleted branch fix/ci-dual-trigger-dedup 2026-07-16 22:18:48 +08:00
Sign in to join this conversation.
Reviewers
No Reviewers
auto-approve-bot
Labels
Clear labels
P0
阻塞性，必须立即处理
 P1
高优先级
 P2
中优先级
 P3
低优先级/后考虑
 architecture
架构设计
 backend
后端相关
 blocked
阻塞中
 bug
Bug修复
 ci-bug
CI本身的bug
 ci-optimization
CI优化类任务
 ci-pipeline
CI流水线/workflow相关
 cleanup
代码清理
 devops
运维/部署/CI
 documentation
文档相关
 feature
新功能
 frontend
前端相关
 question
需要讨论确认
 ready
PR CI通过，可合并
 refactor
代码重构
No Label
Milestone
No items
No Milestone
Projects
Clear projects
No project
Assignees
Clear assignees
auto-approve-bot xiaoxia
No Assignees
2 Participants
Notifications
Due Date
No due date set.
Dependencies

No dependencies set.

Reference: xiaoxia/xiaoxia-saas#425
Delete Branch "fix/ci-dual-trigger-dedup"

Deleting a branch is permanent. Although the deleted branch may continue to exist for a short time before it actually gets removed, it CANNOT be undone in most cases. Continue?