fix(ci): 调度优化+auto-approve/merge SHA修复（解决PR无法自动合并的根因） #475

Closed

xiaoxia wants to merge 21 commits from ci/fix-scheduling-label-mismatch into develop

Author	SHA1	Message	Date
xiaoxia	5d7cd23880	fix(ci): auto-merge使用PR head SHA检查CI状态 CI/CD Pipeline / Check if frontend-only change (pull_request) Successful in 7s Details CI/CD Pipeline / Validate Code Quality And Tests (pull_request) Failing after 26s Details Auto Approve CI PRs / Auto Approve on CI Green (pull_request) Successful in 40s Details CI/CD Pipeline / Unit Tests (pull_request) Failing after 39s Details CI/CD Pipeline / Integration Tests (pull_request) Failing after 56s Details CI/CD Pipeline / Frontend Lint (pull_request) Failing after 1m35s Details Auto Merge PRs (main) / Auto Merge on CI Green + Approved (main) (pull_request) Failing after 1463h52m44s Details	2026-07-17 15:36:59 +08:00
xiaoxia	eeabeb480a	fix(ci): auto-approve使用PR head SHA而非merge SHA检查CI状态 CI/CD Pipeline / Check if frontend-only change (pull_request) Successful in 10s Details CI/CD Pipeline / Validate Code Quality And Tests (pull_request) Failing after 29s Details Auto Approve CI PRs / Auto Approve on CI Green (pull_request) Successful in 51s Details CI/CD Pipeline / Unit Tests (pull_request) Failing after 44s Details CI/CD Pipeline / Integration Tests (pull_request) Has been cancelled Details CI/CD Pipeline / Frontend Lint (pull_request) Has been cancelled Details Auto Merge PRs (main) / Auto Merge on CI Green + Approved (main) (pull_request) Failing after 1463h54m3s Details pull_request事件中GITHUB_SHA是merge commit的虚拟SHA，CI实际运行的是head SHA。用merge SHA查status永远查不到，导致auto-approve一直看到pending，20分钟超时后退出，永远打不了审批。改用github.event.pull_request.head.sha查询。	2026-07-17 15:35:41 +08:00
xiaoxia	82ad237b92	fix(ci): 轻量任务改用ci-check标签，同步develop最新改动 CI/CD Pipeline / Check if frontend-only change (pull_request) Successful in 9s Details CI/CD Pipeline / Validate Code Quality And Tests (pull_request) Failing after 29s Details Auto Approve CI PRs / Auto Approve on CI Green (pull_request) Successful in 41s Details CI/CD Pipeline / Unit Tests (pull_request) Failing after 53s Details CI/CD Pipeline / Integration Tests (pull_request) Failing after 1m3s Details CI/CD Pipeline / Frontend Lint (pull_request) Failing after 1m56s Details Auto Merge PRs (main) / Auto Merge on CI Green + Approved (main) (pull_request) Failing after 1464h10m50s Details	2026-07-17 15:18:54 +08:00
xiaoxia	46067ccd49	fix(ci): auto-approve改用ci-check标签避免调度死锁 CI/CD Pipeline / Check if frontend-only change (pull_request) Successful in 9s Details CI/CD Pipeline / Validate Code Quality And Tests (pull_request) Failing after 27s Details Auto Approve CI PRs / Auto Approve on CI Green (pull_request) Successful in 40s 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 Auto Merge PRs (main) / Auto Merge on CI Green + Approved (main) (pull_request) Failing after 1464h11m34s Details	2026-07-17 15:18:09 +08:00
xiaoxia	9d1d279fb9	fix(ci): 轻量任务改用ci-check标签解决runner调度错配 CI/CD Pipeline / Check if frontend-only change (pull_request) Successful in 6s Details CI/CD Pipeline / Validate Code Quality And Tests (pull_request) Failing after 24s Details CI/CD Pipeline / Unit Tests (pull_request) Failing after 39s Details CI/CD Pipeline / Integration Tests (pull_request) Failing after 51s Details CI/CD Pipeline / Frontend Lint (pull_request) Failing after 1m54s Details Auto Approve CI PRs / Auto Approve on CI Green (pull_request) Successful in 2s Details Auto Merge PRs (main) / Auto Merge on CI Green + Approved (main) (pull_request) Failing after 1464h16m52s Details	2026-07-17 15:12:31 +08:00
xiaoxia	dfb2feef8a	fix(ci): main??auto-merge/approve????Tests/test?? CI/CD Pipeline / Build & Push Staging (Watchtower auto-deploy) (push) Failing after 3s Details CI/CD Pipeline / Staging E2E Tests (push) Failing after 1465h21m19s Details CI/CD Pipeline / Deploy Production (push) Failing after 1465h21m22s Details CI/CD Pipeline / Build Production Runtime Images (push) Failing after 1465h21m23s Details CI/CD Pipeline / Validate Code Quality And Tests (push) Has been skipped Details CI/CD Pipeline / Frontend Lint (push) Has been skipped Details CI/CD Pipeline / Production Browser E2E (push) Failing after 1465h53m20s Details - auto-merge.yml: main????Tests/test,?3??????? - auto-approve.yml: main??????????Tests/test - ??#464???Tests/test???????????	2026-07-17 14:04:23 +08:00
auto-approve-bot	b3ef7bb041	Merge pull request 'feat(ci): main分支auto-merge从定时改为即时合并' (#464 ) from ci/main-auto-merge-instant into main CI/CD Pipeline / Build & Push Staging (Watchtower auto-deploy) (push) Failing after 4s Details CI/CD Pipeline / Staging E2E Tests (push) Failing after 1466h0m8s Details CI/CD Pipeline / Deploy Production (push) Failing after 1466h0m12s Details CI/CD Pipeline / Build Production Runtime Images (push) Failing after 1466h0m13s Details CI/CD Pipeline / Validate Code Quality And Tests (push) Has been skipped Details CI/CD Pipeline / Frontend Lint (push) Has been skipped Details CI/CD Pipeline / Production Browser E2E (push) Failing after 1466h32m10s Details	2026-07-17 13:27:18 +08:00
xiaoxia	a1a272b833	feat(ci): 添加auto-approve到main分支并适配main门禁规则 Tests / lint (pull_request) Successful in 6s Details Tests / test (pull_request) Failing after 29s 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 CI/CD Pipeline / Production Browser E2E (pull_request) Failing after 1466h2m30s Details CI/CD Pipeline / Build Production Runtime Images (pull_request) Failing after 1466h2m34s Details CI/CD Pipeline / Build & Push Staging (Watchtower auto-deploy) (pull_request) Failing after 1466h2m34s Details CI/CD Pipeline / Deploy Production (pull_request) Failing after 1466h2m32s Details CI/CD Pipeline / Validate Code Quality And Tests (pull_request) Has been skipped Details CI/CD Pipeline / Frontend Lint (pull_request) Has been skipped Details CI/CD Pipeline / Staging E2E Tests (pull_request) Failing after 1466h34m32s 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 Auto Merge PRs (main) / Auto Merge on CI Green + Approved (main) (pull_request) Successful in 20m36s Details CI/CD Pipeline / Production Browser E2E (pull_request) Failing after 1466h21m15s Details CI/CD Pipeline / Build Production Runtime Images (pull_request) Failing after 1466h21m17s Details CI/CD Pipeline / Build & Push Staging (Watchtower auto-deploy) (pull_request) Failing after 1466h21m17s Details CI/CD Pipeline / Deploy Production (pull_request) Failing after 1466h21m16s Details CI/CD Pipeline / Validate Code Quality And Tests (pull_request) Has been skipped Details CI/CD Pipeline / Frontend Lint (pull_request) Has been skipped Details CI/CD Pipeline / Staging E2E Tests (pull_request) Failing after 1466h53m15s 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 / Production Browser E2E (pull_request) Failing after 1466h49m39s Details CI/CD Pipeline / Staging E2E Tests (pull_request) Failing after 1466h49m40s Details CI/CD Pipeline / Build Production Runtime Images (pull_request) Failing after 1466h49m41s Details CI/CD Pipeline / Build & Push Staging (Watchtower auto-deploy) (pull_request) Failing after 1466h49m41s Details CI/CD Pipeline / Validate Code Quality And Tests (pull_request) Has been skipped Details CI/CD Pipeline / Frontend Lint (pull_request) Has been skipped Details CI/CD Pipeline / Deploy Production (pull_request) Failing after 1467h21m39s Details - 触发方式：pull_request事件（CI状态变更时） - 合并条件：2门禁全绿 + 至少1个APPROVED + 无冲突 + 非草稿 - 安全措施：幂等保护、合并失败留评论、只合main - 新增check_ci_status.py和check_pr_approval.py辅助脚本	2026-07-17 12:37:24 +08:00
xiaoxia	df08161630	fix(ci): 修复auto-merge缺少GITEA_API_TOKEN环境变量 CI/CD Pipeline / Build & Push Staging (Watchtower auto-deploy) (push) Failing after 7s Details CI/CD Pipeline / Staging E2E Tests (push) Failing after 1470h25m27s Details CI/CD Pipeline / Deploy Production (push) Failing after 1470h25m35s Details CI/CD Pipeline / Build Production Runtime Images (push) Failing after 1470h25m36s Details CI/CD Pipeline / Validate Code Quality And Tests (push) Has been skipped Details CI/CD Pipeline / Frontend Lint (push) Has been skipped Details CI/CD Pipeline / Production Browser E2E (push) Failing after 1470h57m29s Details 1. 给auto-merge.yml的两个merge step添加GITEA_API_TOKEN环境变量，复用REVIEW_GITEA_TOKEN secret 2. 修复tests.yml的checkout步骤GITHUB_TOKEN和Python命令 3. 给main分支ci-cd.yml的单元测试增加Redis服务，修复Celery相关测试失败	2026-07-17 09:02:33 +08:00
xiaoxia	0c9375ff32	ci: remove temporary debug workflow - test-ssh-secret.yml Fix Flake8 E741 for PR232 / fix-flake8 (push) Failing after 3h4m59s Details CI/CD Pipeline / Staging E2E Tests (push) Failing after 1577h41m48s Details CI/CD Pipeline / Validate Code Quality And Tests (push) Failing after 36s Details CI/CD Pipeline / Frontend Lint (push) Failing after 0s Details CI/CD Pipeline / Build & Push Staging (Watchtower auto-deploy) (push) Failing after 1577h10m16s Details CI/CD Pipeline / Deploy Production (push) Failing after 1577h10m14s Details CI/CD Pipeline / Production Browser E2E (push) Failing after 1577h10m11s Details CI/CD Pipeline / Build Production Runtime Images (push) Failing after 1577h10m16s Details	2026-07-12 10:25:12 +08:00
xiaoxia	ef344e9ffc	cleanup: remove upgrade test file CI/CD Pipeline / Build & Push Staging (Watchtower auto-deploy) (push) Failing after 12h43m56s Details CI/CD Pipeline / Frontend Lint (push) Failing after 12h45m50s Details CI/CD Pipeline / Validate Code Quality And Tests (push) Failing after 12h45m50s Details CI/CD Pipeline / Staging E2E Tests (push) Failing after 1671h17m1s Details CI/CD Pipeline / Deploy Production (push) Failing after 1671h20m0s Details CI/CD Pipeline / Build Production Runtime Images (push) Failing after 1671h20m2s Details CI/CD Pipeline / Production Browser E2E (push) Failing after 1671h51m26s Details	2026-07-09 00:08:40 +08:00
xiaoxia	0d4904433e	test: trigger workflow after gitea upgrade CI/CD Pipeline / Staging E2E Tests (push) Failing after 12h49m24s Details CI/CD Pipeline / Build & Push Staging (Watchtower auto-deploy) (push) Failing after 12h53m37s Details CI/CD Pipeline / Frontend Lint (push) Failing after 12h56m8s Details CI/CD Pipeline / Validate Code Quality And Tests (push) Failing after 12h56m8s Details CI/CD Pipeline / Production Browser E2E (push) Failing after 1671h29m39s Details CI/CD Pipeline / Build Production Runtime Images (push) Failing after 1671h29m43s Details CI/CD Pipeline / Deploy Production (push) Failing after 1672h1m9s Details	2026-07-08 23:58:20 +08:00
CI Test	708662394f	Merge develop into main - v0.1.126 Auto Merge PRs / auto-merge (push) Has been cancelled Details CI/CD Pipeline / Validate Code Quality And Tests (push) Failing after 29h56m45s Details CI/CD Pipeline / Frontend Lint (push) Failing after 29h56m45s Details CI/CD Pipeline / Deploy Production (push) Failing after 1688h31m42s Details CI/CD Pipeline / Build & Push Staging (Watchtower auto-deploy) (push) Failing after 1688h31m44s Details CI/CD Pipeline / Staging E2E Tests (push) Failing after 1689h3m9s Details CI/CD Pipeline / Build Production Runtime Images (push) Failing after 1688h31m44s Details CI/CD Pipeline / Production Browser E2E (push) Failing after 1688h31m39s Details	2026-07-08 06:57:42 +08:00
CI Test	9b034764ad	Merge develop into main - v0.1.125 Auto Merge PRs / auto-merge (push) Failing after 1m29s Details CI/CD Pipeline / Validate Code Quality And Tests (push) Failing after 40h59m5s Details CI/CD Pipeline / Frontend Lint (push) Failing after 40h58m8s Details CI/CD Pipeline / Deploy Staging (push) Failing after 1699h32m50s Details CI/CD Pipeline / Deploy Production (push) Failing after 1699h32m48s Details CI/CD Pipeline / Build Production Runtime Images (push) Failing after 1699h32m50s Details CI/CD Pipeline / Production Browser E2E (push) Failing after 1699h31m20s Details CI/CD Pipeline / Staging E2E Tests (push) Failing after 1699h32m48s Details	2026-07-07 19:54:54 +08:00
CI Test	8748b43070	Merge develop into main - v0.1.124 CI/CD Pipeline / Validate Code Quality And Tests (push) Failing after 45h16m36s Details CI/CD Pipeline / Frontend Lint (push) Failing after 45h16m32s Details CI/CD Pipeline / Deploy Staging (push) Failing after 1703h45m33s Details CI/CD Pipeline / Build Production Runtime Images (push) Failing after 45h9m27s Details CI/CD Pipeline / Deploy Production (push) Failing after 45h8m45s Details CI/CD Pipeline / Staging E2E Tests (push) Failing after 1703h44m57s Details CI/CD Pipeline / Production Browser E2E (push) Failing after 1703h44m30s Details	2026-07-07 15:36:36 +08:00
CI Test	d213a055a1	Merge develop into main - v0.1.123 Auto Merge PRs / auto-merge (push) Failing after 3m27s Details CI/CD Pipeline / Validate Code Quality And Tests (push) Failing after 47h9m34s Details CI/CD Pipeline / Frontend Lint (push) Failing after 47h8m47s Details CI/CD Pipeline / Deploy Staging (push) Failing after 47h6m52s Details CI/CD Pipeline / Deploy Production (push) Failing after 1705h41m20s Details CI/CD Pipeline / Staging E2E Tests (push) Failing after 1705h41m20s Details CI/CD Pipeline / Build Production Runtime Images (push) Failing after 1705h41m52s Details CI/CD Pipeline / Production Browser E2E (push) Failing after 1705h41m18s Details	2026-07-07 13:44:46 +08:00
CI Test	2371860f82	Merge develop into main - v0.1.122 (prettier fix) CI/CD Pipeline / Validate Code Quality And Tests (push) Failing after 49h37m40s Details CI/CD Pipeline / Frontend Lint (push) Failing after 49h37m23s Details CI/CD Pipeline / Build Production Runtime Images (push) Failing after 49h35m42s Details CI/CD Pipeline / Deploy Production (push) Failing after 49h33m12s Details CI/CD Pipeline / Production Browser E2E (push) Failing after 49h27m0s Details CI/CD Pipeline / Deploy Staging (push) Failing after 1708h11m48s Details CI/CD Pipeline / Staging E2E Tests (push) Failing after 1708h9m27s Details	2026-07-07 11:04:39 +08:00
CI Test	dbd956fc6e	Merge develop into main - v0.1.122 CI/CD Pipeline / Validate Code Quality And Tests (push) Failing after 49h54m54s Details CI/CD Pipeline / Frontend Lint (push) Failing after 49h54m54s Details CI/CD Pipeline / Build Production Runtime Images (push) Failing after 1708h14m26s Details CI/CD Pipeline / Deploy Staging (push) Failing after 1708h14m26s Details CI/CD Pipeline / Deploy Production (push) Failing after 1708h12m14s Details CI/CD Pipeline / Production Browser E2E (push) Failing after 1708h10m25s Details CI/CD Pipeline / Staging E2E Tests (push) Failing after 1708h12m14s Details	2026-07-07 10:59:31 +08:00
CI Test	1d59ee5336	Merge develop into main - v0.1.121 CI/CD Pipeline / Validate Code Quality And Tests (push) Failing after 52h47m33s Details CI/CD Pipeline / Frontend Lint (push) Failing after 52h46m49s Details CI/CD Pipeline / Build Production Runtime Images (push) Failing after 52h46m3s Details CI/CD Pipeline / Deploy Production (push) Failing after 52h45m27s Details CI/CD Pipeline / Deploy Staging (push) Failing after 1711h22m10s Details CI/CD Pipeline / Production Browser E2E (push) Failing after 1711h19m57s Details CI/CD Pipeline / Staging E2E Tests (push) Failing after 1711h21m45s Details	2026-07-07 08:05:42 +08:00

fix(ci): 调度优化+auto-approve/merge SHA修复（解决PR无法自动合并的根因） #475

21 Commits