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

feat(ci): main分支auto-merge从定时改为即时合并 #464

Merged
auto-approve-bot merged 3 commits from ci/main-auto-merge-instant into main 2026-07-17 13:27:18 +08:00
Conversation 2 Commits 3 Files Changed 4
+374 -15
xiaoxia commented 2026-07-17 12:37:35 +08:00
Owner
Copy Link
Copy Source

变更内容

main分支auto-merge从每6小时定时触发，改为PR事件即时合并（与develop对齐）。

改造前

  • 触发：0 */6 * * * cron定时，每6小时扫一次
  • 逻辑：只要mergeable就合，不检查CI/审批
  • 延迟：最长6小时

改造后

  • 触发：pull_request事件（CI状态变更时）
  • 条件：2门禁全绿 + 至少1个APPROVED + 无冲突 + 非草稿
  • 延迟：CI全绿后几秒内合并
  • 安全：幂等保护、合并失败留评论、只合main不动其他分支

新增文件

  • scripts/check_ci_status.py - CI状态检查辅助脚本
  • scripts/check_pr_approval.py - PR审批检查辅助脚本

main分支门禁（2个）

  • Validate Code Quality And Tests
  • Frontend Lint
## 变更内容 main分支auto-merge从每6小时定时触发，改为PR事件即时合并（与develop对齐）。 ### 改造前 - 触发：`0 */6 * * *` cron定时，每6小时扫一次 - 逻辑：只要mergeable就合，不检查CI/审批 - 延迟：最长6小时 ### 改造后 - 触发：`pull_request`事件（CI状态变更时） - 条件：2门禁全绿 + 至少1个APPROVED + 无冲突 + 非草稿 - 延迟：CI全绿后几秒内合并 - 安全：幂等保护、合并失败留评论、只合main不动其他分支 ### 新增文件 - `scripts/check_ci_status.py` - CI状态检查辅助脚本 - `scripts/check_pr_approval.py` - PR审批检查辅助脚本 ### main分支门禁（2个） - Validate Code Quality And Tests - Frontend Lint
xiaoxia added 1 commit 2026-07-17 12:37:35 +08:00
feat(ci): main分支auto-merge从定时改为即时合并
Tests / lint (pull_request) Failing after 9s
Details
Tests / test (pull_request) Failing after 28s
Details
Auto Merge PRs (main) / Auto Merge on CI Green + Approved (main) (pull_request) Failing after 30s
Details
CI/CD Pipeline / Validate Code Quality And Tests (pull_request) Successful in 1m53s
Details
CI/CD Pipeline / Frontend Lint (pull_request) Successful in 2m29s
Details
CI/CD Pipeline / Build Production Runtime Images (pull_request) Has been skipped
Details
CI/CD Pipeline / Build & Push Staging (Watchtower auto-deploy) (pull_request) Has been skipped
Details
CI/CD Pipeline / Staging E2E 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
7e5e412f7f 
- 触发方式：pull_request事件（CI状态变更时）
- 合并条件：2门禁全绿 + 至少1个APPROVED + 无冲突 + 非草稿
- 安全措施：幂等保护、合并失败留评论、只合main
- 新增check_ci_status.py和check_pr_approval.py辅助脚本
xiaoxia added the ci-pipeline label 2026-07-17 12:57:47 +08:00
xiaoxia added 1 commit 2026-07-17 13:06:42 +08:00
chore: empty commit to re-trigger CI for auto-merge verification
Tests / lint (pull_request) Successful in 9s
Details
Tests / test (pull_request) Failing after 21s
Details
CI/CD Pipeline / Validate Code Quality And Tests (pull_request) Successful in 1m32s
Details
CI/CD Pipeline / Frontend Lint (pull_request) Successful in 1m44s
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 / Deploy Production (pull_request) Has been skipped
Details
CI/CD Pipeline / Production Browser E2E (pull_request) Has been skipped
Details
Auto Merge PRs (main) / Auto Merge on CI Green + Approved (main) (pull_request) Successful in 20m36s
Details
728db0faf8
xiaoxia added 1 commit 2026-07-17 13:24:23 +08:00
feat(ci): 添加auto-approve到main分支并适配main门禁规则
Tests / lint (pull_request) Successful in 6s
Details
Tests / test (pull_request) Failing after 29s
Details
CI/CD Pipeline / Validate Code Quality And Tests (pull_request) Successful in 2m23s
Details
CI/CD Pipeline / Frontend Lint (pull_request) Successful in 2m46s
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 / Deploy Production (pull_request) Has been skipped
Details
CI/CD Pipeline / Production Browser E2E (pull_request) Has been skipped
Details
Auto Approve CI PRs / Auto Approve on CI Green (pull_request) Successful in 2m54s
Details
Auto Merge PRs (main) / Auto Merge on CI Green + Approved (main) (pull_request) Successful in 3m0s
Details
a1a272b833
auto-approve-bot approved these changes 2026-07-17 13:27:17 +08:00
auto-approve-bot left a comment
Collaborator
Copy Link
Copy Source

CI全绿，自动审批通过。

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

CI全绿，自动审批通过。

CI全绿，自动审批通过。
auto-approve-bot merged commit b3ef7bb041 into main 2026-07-17 13:27:18 +08:00
auto-approve-bot deleted branch ci/main-auto-merge-instant 2026-07-17 13:27: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 ci-pipeline
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#464
Delete Branch "ci/main-auto-merge-instant"

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?