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

fix(ci): auto-approve/merge只检查分支保护required门禁，避免非required失败阻塞自动合并 #644

Merged
xiaoxia merged 1 commits from fix/ci-autoapprove-match-branch-protection into develop 2026-07-20 14:29:37 +08:00
Conversation 3 Commits 1 Files Changed 1
+2 -6
xiaoxia commented 2026-07-20 14:19:36 +08:00
Owner
Copy Link
Copy Source

问题

当前auto-approve和auto-merge把Unit Tests、Integration Tests都当必须通过的检查，但分支保护的required门禁只有Validate和Frontend Lint两个。

导致：develop上本身就有的Unit Tests失败（业务测试用例bug，非PR引入）会阻塞所有PR的自动审批和合并，每次都得手动approve+merge。

修复

auto-approve和auto-merge的检查列表与分支保护对齐：

  • 非纯前端PR：Validate + Frontend Lint（2项，与status_check_contexts一致）
  • 纯前端PR：Frontend Lint（1项）

设计原则

分支保护是Gitea层面的硬门禁，自动化脚本的判断标准应该和Gitea一致。非required的CI失败是告警/改进项，不应该阻塞正常合并流程。

影响

  • Unit Tests、Integration Tests等非required门禁失败不再阻塞自动合并
  • 与Gitea分支保护规则完全对齐，行为一致可预测
## 问题 当前auto-approve和auto-merge把Unit Tests、Integration Tests都当必须通过的检查，但**分支保护的required门禁只有Validate和Frontend Lint两个**。 导致：develop上本身就有的Unit Tests失败（业务测试用例bug，非PR引入）会阻塞所有PR的自动审批和合并，每次都得手动approve+merge。 ## 修复 auto-approve和auto-merge的检查列表与分支保护对齐： - **非纯前端PR**：Validate + Frontend Lint（2项，与status_check_contexts一致） - **纯前端PR**：Frontend Lint（1项） ## 设计原则 分支保护是Gitea层面的硬门禁，自动化脚本的判断标准应该和Gitea一致。非required的CI失败是告警/改进项，不应该阻塞正常合并流程。 ## 影响 - Unit Tests、Integration Tests等非required门禁失败不再阻塞自动合并 - 与Gitea分支保护规则完全对齐，行为一致可预测
xiaoxia added 1 commit 2026-07-20 14:19:36 +08:00
fix(ci): auto-approve/merge只检查分支保护required门禁，避免非required失败阻塞自动合并
CI/CD Pipeline / Build Staging API Image (pull_request) Has been skipped
Details
CI/CD Pipeline / Build Staging Web Image (pull_request) Has been skipped
Details
CI/CD Pipeline / Build Staging Worker Image (pull_request) Has been skipped
Details
CI/CD Pipeline / Deploy Staging (Watchtower auto-deploy) (pull_request) Has been skipped
Details
CI/CD Pipeline / Build Production API Image (pull_request) Has been skipped
Details
CI/CD Pipeline / Build Production Web Image (pull_request) Has been skipped
Details
CI/CD Pipeline / Build Production Worker Image (pull_request) Has been skipped
Details
CI/CD Pipeline / Staging E2E Tests (pull_request) Has been skipped
Details
CI/CD Pipeline / Staging API Integration Tests (pull_request) Has been skipped
Details
CI/CD Pipeline / Deploy Production (pull_request) Has been skipped
Details
CI/CD Pipeline / ACR Image Cleanup (pull_request) Has been skipped
Details
CI/CD Pipeline / Production Browser E2E (pull_request) Has been skipped
Details
Preview Deploy / Deploy Preview Environment (pull_request) Failing after 17s
Details
AI Code Review / AI Code Review (pull_request) Failing after 36s
Details
CI/CD Pipeline / Check if frontend-only change (pull_request) Successful in 5s
Details
CI/CD Pipeline / Frontend Unit Tests (pull_request) Has been skipped
Details
CI/CD Pipeline / Validate Code Quality And Tests (pull_request) Successful in 4m23s
Details
CI/CD Pipeline / Frontend Lint (pull_request) Successful in 6m50s
Details
PR Automation / Auto Approve on CI Green (pull_request) Successful in 9m5s
Details
PR Automation / Auto Merge on CI Green + Approved (pull_request) Successful in 10m13s
Details
Preview Cleanup / Cleanup Preview Environment (pull_request) Successful in 23s
Details
CI/CD Pipeline / Unit Tests (pull_request) Failing after 7m7s
Details
CI/CD Pipeline / Integration Tests (pull_request) Successful in 3m54s
Details
ea5a937984
auto-approve-bot approved these changes 2026-07-20 14:28:41 +08:00
auto-approve-bot left a comment
Collaborator
Copy Link
Copy Source

CI全绿，自动审批通过。

CI全绿，自动审批通过。
auto-approve-bot approved these changes 2026-07-20 14:28:41 +08:00
auto-approve-bot left a comment
Collaborator
Copy Link
Copy Source

CI全绿，自动审批通过。

CI全绿，自动审批通过。
xiaoxia merged commit 3502a03ff5 into develop 2026-07-20 14:29:37 +08:00
gitea-actions bot commented 2026-07-20 14:30:00 +08:00
Copy Link
Copy Source

🗑️ 预览环境已清理

PR #644 已关闭或合并，对应的预览环境已被清理。

如有需要，可以重新打开 PR 来重新生成预览环境。

🗑️ **预览环境已清理** PR #644 已关闭或合并，对应的预览环境已被清理。 > 如有需要，可以重新打开 PR 来重新生成预览环境。
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
3 Participants
Notifications
Due Date
No due date set.
Dependencies

No dependencies set.

Reference: xiaoxia/xiaoxia-saas#644
Delete Branch "fix/ci-autoapprove-match-branch-protection"

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?