xiaoxia/xiaoxia-saas

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

Author	SHA1	Message	Date
xiaoxia	e388f6cb88	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	2026-07-17 11:46:14 +08:00
xiaoxia	7f8c648bb7	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	2026-07-17 11:34:01 +08:00
xiaoxia	7bc7fb55f6	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 用于auto-merge workflow检查PR是否有足够APPROVED审批	2026-07-17 11:31:50 +08:00
xiaoxia	0593e8e67e	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 改用独立脚本scripts/check_pr_approval.py检查审批状态，避免YAML块标量多行缩进问题	2026-07-17 11:31:38 +08:00
xiaoxia	9a1483b52e	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 - 触发方式：从cron定时改为pull_request事件触发 - 合并条件：三门禁全绿 + 至少1个APPROVED + 无冲突 + 非草稿 + base=develop - 安全措施：幂等保护、合并失败留评论不重试、只合develop - 从6小时延迟改为秒级自动合并	2026-07-17 11:20:24 +08:00