xiaoxia/xiaoxia-saas
1
0
Fork 0
Code Issues 9 Pull Requests 2 Actions 4 Packages Projects Releases 7 Wiki Activity

fix(auto-merge): 合并PR前验证CI状态（validate + frontend-lint） #253

Merged
xiaoxia merged 1 commits from feat/auto-merge-ci-check into develop 2026-07-15 22:57:18 +08:00
Conversation 2 Commits 1 Files Changed 1
+76 -11
xiaoxia commented 2026-07-13 14:55:01 +08:00
Owner
Copy Link
Copy Source

变更说明

修复 auto_merge_prs.sh 脚本在合并PR前只检查 mergeable 标志的问题，改为必须验证指定CI检查项全部通过才允许合并。

修改内容

  • 新增 CI 状态检查逻辑：调用 /commits/{sha}/status API 获取PR头部commit的combined CI状态
  • 必需检查项：Validate Code Quality And Tests、Frontend Lint
  • 任一检查项非 success 状态则跳过合并并输出原因
  • 使用前缀匹配context名称，避免pipeline名称微调导致匹配失败
  • 优化输出格式，更清晰展示每个PR的检查结果

背景

原脚本仅凭Gitea的mergeable字段判断是否可合并，但该字段只检查冲突，不检查CI状态。CI未通过的PR也可能被自动合并。

## 变更说明 修复 auto_merge_prs.sh 脚本在合并PR前只检查 `mergeable` 标志的问题，改为必须验证指定CI检查项全部通过才允许合并。 ### 修改内容 - 新增 CI 状态检查逻辑：调用 `/commits/{sha}/status` API 获取PR头部commit的combined CI状态 - 必需检查项：`Validate Code Quality And Tests`、`Frontend Lint` - 任一检查项非 success 状态则跳过合并并输出原因 - 使用前缀匹配context名称，避免pipeline名称微调导致匹配失败 - 优化输出格式，更清晰展示每个PR的检查结果 ### 背景 原脚本仅凭Gitea的`mergeable`字段判断是否可合并，但该字段只检查冲突，不检查CI状态。CI未通过的PR也可能被自动合并。
xiaoxia added 1 commit 2026-07-13 14:55:01 +08:00
fix(auto-merge): add CI status validation before merging PRs
CI/CD Pipeline / Validate Code Quality And Tests (pull_request) Successful in 46s
Details
CI/CD Pipeline / Unit Tests (pull_request) Successful in 1m4s
Details
CI/CD Pipeline / Integration Tests (pull_request) Successful in 1m38s
Details
CI/CD Pipeline / Frontend Lint (pull_request) Successful in 2m31s
Details
CI/CD Pipeline / Build & Push Staging (Watchtower auto-deploy) (pull_request) Has been skipped
Details
CI/CD Pipeline / Build Production Runtime Images (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 / Production Browser E2E (pull_request) Has been skipped
Details
1babf11c4f
xiaoxia reviewed 2026-07-13 15:20:43 +08:00
xiaoxia left a comment
Author
Owner
Copy Link
Copy Source

Approved by 灵应 - CI优化项目组审批

Approved by 灵应 - CI优化项目组审批
auto-approve-bot approved these changes 2026-07-15 11:47:52 +08:00
auto-approve-bot left a comment
Collaborator
Copy Link
Copy Source

自动审批：三门禁全绿，符合合并条件

自动审批：三门禁全绿，符合合并条件
xiaoxia merged commit d2ce73184a into develop 2026-07-15 22:57:18 +08:00
xiaoxia deleted branch feat/auto-merge-ci-check 2026-07-15 22:57:18 +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#253
Delete Branch "feat/auto-merge-ci-check"

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?