xiaoxia/xiaoxia-saas

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

Author	SHA1	Message	Date
xiaoxia	a1a272b833	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	2026-07-17 13:24:21 +08:00
xiaoxia	728db0faf8	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	2026-07-17 13:06:40 +08:00
xiaoxia	7e5e412f7f	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 - 触发方式：pull_request事件（CI状态变更时） - 合并条件：2门禁全绿 + 至少1个APPROVED + 无冲突 + 非草稿 - 安全措施：幂等保护、合并失败留评论、只合main - 新增check_ci_status.py和check_pr_approval.py辅助脚本	2026-07-17 12:37:24 +08:00