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

feat(ci): auto-merge从定时触发改为PR事件即时合并 #441

Merged
auto-approve-bot merged 5 commits from feat/ci-auto-merge-instant into develop 2026-07-17 11:50:27 +08:00
Conversation 5 Commits 5 Files Changed 2
+191
xiaoxia commented 2026-07-17 11:20:33 +08:00
Owner
Copy Link
Copy Source

变更内容

  • 触发方式：从 cron 每6小时定时触发 → pull_request 事件即时触发
  • 合并条件（保持不变）：
    • CI三门禁全绿（Validate/Unit Tests/Frontend Lint）
    • 至少 1 个 APPROVED 审批
    • PR 可合并（无冲突、非草稿）
    • base=develop

安全措施

  • 幂等保护：已 merged/closed 的 PR 直接跳过
  • 合并失败在 PR 留评论提醒，不重试（避免死循环）
  • 只合 develop，不动 main
  • 纯前端改动只检查 Frontend Lint

效果

从 6 小时延迟 → 秒级自动合并

验证

合入后找个已审批PR测试，确认CI全绿后秒合

## 变更内容 - **触发方式**：从 cron 每6小时定时触发 → pull_request 事件即时触发 - **合并条件**（保持不变）： - CI三门禁全绿（Validate/Unit Tests/Frontend Lint） - 至少 1 个 APPROVED 审批 - PR 可合并（无冲突、非草稿） - base=develop ## 安全措施 - 幂等保护：已 merged/closed 的 PR 直接跳过 - 合并失败在 PR 留评论提醒，不重试（避免死循环） - 只合 develop，不动 main - 纯前端改动只检查 Frontend Lint ## 效果 从 6 小时延迟 → 秒级自动合并 ## 验证 合入后找个已审批PR测试，确认CI全绿后秒合
xiaoxia added 1 commit 2026-07-17 11:20:33 +08:00
feat(ci): auto-merge从定时触发改为PR事件即时合并
CI Build & Deploy Pipeline / Build Staging Worker Image (pull_request) Has been skipped
Details
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 / Deploy Staging (Watchtower auto-deploy) (pull_request) Has been skipped
Details
CI Build & Deploy Pipeline / Build Production API Image (pull_request) Has been skipped
Details
CI Build & Deploy Pipeline / Staging E2E Tests (pull_request) Has been skipped
Details
CI Build & Deploy Pipeline / Staging API Integration Tests (pull_request) Has been skipped
Details
CI Build & Deploy Pipeline / Build Production Web Image (pull_request) Has been skipped
Details
CI Build & Deploy Pipeline / Build Production Worker Image (pull_request) Has been skipped
Details
CI Build & Deploy Pipeline / Deploy Production (pull_request) Has been skipped
Details
CI Build & Deploy Pipeline / Production Browser E2E (pull_request) Has been skipped
Details
CI/CD Pipeline / Check if frontend-only change (pull_request) Successful in 10s
Details
CI/CD Pipeline / Frontend Lint (pull_request) Successful in 34s
Details
AI Code Review / AI Code Review (pull_request) Successful in 56s
Details
CI/CD Pipeline / Unit Tests (pull_request) Successful in 2m32s
Details
CI/CD Pipeline / Validate Code Quality And Tests (pull_request) Successful in 3m22s
Details
Auto Approve CI PRs / Auto Approve on CI Green (pull_request) Successful in 3m40s
Details
CI/CD Pipeline / Integration Tests (pull_request) Successful in 1m15s
Details
9a1483b52e 
- 触发方式：从cron定时改为pull_request事件触发
- 合并条件：三门禁全绿 + 至少1个APPROVED + 无冲突 + 非草稿 + base=develop
- 安全措施：幂等保护、合并失败留评论不重试、只合develop
- 从6小时延迟改为秒级自动合并
auto-approve-bot approved these changes 2026-07-17 11:24:13 +08:00
auto-approve-bot left a comment
Collaborator
Copy Link
Copy Source

CI全绿，自动审批通过。

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

CI全绿，自动审批通过。

CI全绿，自动审批通过。
xiaoxia added 1 commit 2026-07-17 11:31:38 +08:00
fix(ci): 修复auto-merge YAML语法 - 内联多行Python导致解析失败
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 Web Image (pull_request) Has been skipped
Details
CI Build & Deploy Pipeline / Build Production 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 / Staging API Integration Tests (pull_request) Has been skipped
Details
CI Build & Deploy Pipeline / Deploy Production (pull_request) Has been skipped
Details
CI Build & Deploy Pipeline / Staging E2E Tests (pull_request) Has been skipped
Details
CI Build & Deploy Pipeline / Production Browser E2E (pull_request) Has been skipped
Details
CI/CD Pipeline / Check if frontend-only change (pull_request) Has been cancelled
Details
CI/CD Pipeline / Validate Code Quality And Tests (pull_request) Has been cancelled
Details
CI/CD Pipeline / Unit Tests (pull_request) Has been cancelled
Details
CI/CD Pipeline / Integration Tests (pull_request) Has been cancelled
Details
CI/CD Pipeline / Frontend Lint (pull_request) Has been cancelled
Details
AI Code Review / AI Code Review (pull_request) Has been cancelled
Details
Auto Merge CI PRs / Auto Merge on CI Green + Approved (pull_request) Failing after 14s
Details
Auto Approve CI PRs / Auto Approve on CI Green (pull_request) Successful in 18s
Details
0593e8e67e 
改用独立脚本scripts/check_pr_approval.py检查审批状态，避免YAML块标量多行缩进问题
xiaoxia added 1 commit 2026-07-17 11:31:52 +08:00
feat(ci): 新增PR审批检查脚本
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 Web Image (pull_request) Has been skipped
Details
CI Build & Deploy Pipeline / Build Production 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 / Deploy Production (pull_request) Has been skipped
Details
CI Build & Deploy Pipeline / Staging E2E Tests (pull_request) Has been skipped
Details
CI Build & Deploy Pipeline / Staging API Integration Tests (pull_request) Has been skipped
Details
CI Build & Deploy Pipeline / Production Browser E2E (pull_request) Has been skipped
Details
Auto Merge CI PRs / Auto Merge on CI Green + Approved (pull_request) Failing after 15s
Details
CI/CD Pipeline / Check if frontend-only change (pull_request) Successful in 15s
Details
AI Code Review / AI Code Review (pull_request) Failing after 28s
Details
CI/CD Pipeline / Frontend Lint (pull_request) Successful in 36s
Details
CI/CD Pipeline / Validate Code Quality And Tests (pull_request) Has been cancelled
Details
CI/CD Pipeline / Unit Tests (pull_request) Has been cancelled
Details
CI/CD Pipeline / Integration Tests (pull_request) Has been cancelled
Details
Auto Approve CI PRs / Auto Approve on CI Green (pull_request) Successful in 2m13s
Details
7bc7fb55f6 
用于auto-merge workflow检查PR是否有足够APPROVED审批
xiaoxia added 1 commit 2026-07-17 11:34:02 +08:00
fix(ci): 修复auto-merge bash脚本引号不闭合问题
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 Staging 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 API Image (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 E2E Tests (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 API Integration Tests (pull_request) Has been skipped
Details
CI Build & Deploy Pipeline / Deploy Production (pull_request) Has been skipped
Details
CI Build & Deploy Pipeline / Production Browser E2E (pull_request) Has been skipped
Details
CI/CD Pipeline / Check if frontend-only change (pull_request) Successful in 9s
Details
AI Code Review / AI Code Review (pull_request) Failing after 30s
Details
CI/CD Pipeline / Frontend Lint (pull_request) Successful in 36s
Details
CI/CD Pipeline / Validate Code Quality And Tests (pull_request) Successful in 1m55s
Details
CI/CD Pipeline / Unit Tests (pull_request) Successful in 2m48s
Details
Auto Merge CI PRs / Auto Merge on CI Green + Approved (pull_request) Successful in 3m11s
Details
Auto Approve CI PRs / Auto Approve on CI Green (pull_request) Successful in 3m15s
Details
CI/CD Pipeline / Integration Tests (pull_request) Successful in 1m22s
Details
7f8c648bb7
auto-approve-bot commented 2026-07-17 11:37:15 +08:00
Collaborator
Copy Link
Copy Source

Auto merge failed: PR may have conflicts or unresolved checks. Please review manually.

Auto merge failed: PR may have conflicts or unresolved checks. Please review manually.
auto-approve-bot reviewed 2026-07-17 11:37:18 +08:00
auto-approve-bot left a comment
Collaborator
Copy Link
Copy Source

CI全绿，自动审批通过。

CI全绿，自动审批通过。
xiaoxia added 1 commit 2026-07-17 11:46:15 +08:00
fix(ci): auto-merge增加Integration Tests门禁检查
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 Worker Image (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 API Integration Tests (pull_request) Has been skipped
Details
CI Build & Deploy Pipeline / Deploy Production (pull_request) Has been skipped
Details
CI Build & Deploy Pipeline / Staging E2E Tests (pull_request) Has been skipped
Details
CI Build & Deploy Pipeline / Production Browser E2E (pull_request) Has been skipped
Details
CI/CD Pipeline / Check if frontend-only change (pull_request) Successful in 14s
Details
CI/CD Pipeline / Frontend Lint (pull_request) Successful in 51s
Details
AI Code Review / AI Code Review (pull_request) Successful in 1m1s
Details
CI/CD Pipeline / Validate Code Quality And Tests (pull_request) Successful in 2m19s
Details
CI/CD Pipeline / Unit Tests (pull_request) Successful in 2m36s
Details
Auto Approve CI PRs / Auto Approve on CI Green (pull_request) Successful in 2m58s
Details
CI/CD Pipeline / Integration Tests (pull_request) Successful in 1m30s
Details
Auto Merge CI PRs / Auto Merge on CI Green + Approved (pull_request) Successful in 4m12s
Details
e388f6cb88
auto-approve-bot reviewed 2026-07-17 11:49:14 +08:00
auto-approve-bot left a comment
Collaborator
Copy Link
Copy Source

CI全绿，自动审批通过。

CI全绿，自动审批通过。
auto-approve-bot merged commit b55a28683e into develop 2026-07-17 11:50:27 +08:00
auto-approve-bot deleted branch feat/ci-auto-merge-instant 2026-07-17 11:50:27 +08:00
xiaoxia added the ci-pipeline label 2026-07-17 12:24:05 +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#441
Delete Branch "feat/ci-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?