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

fix(ci): 修复调度死锁+auto-approve/merge SHA错误 #478

Merged
auto-approve-bot merged 5 commits from ci/fix-sched-sha into develop 2026-07-17 17:02:48 +08:00
Conversation 2 Commits 5 Files Changed 4
+18 -10
xiaoxia commented 2026-07-17 16:22:40 +08:00
Owner
Copy Link
Copy Source

修复内容

1. 调度标签优化（解除死锁）

  • ci-cd.yml轻量job: ci-l1 → ci-check
  • auto-approve.yml: ci-l1 → ci-check
  • 所有runner都有ci-check标签，12个runner全可用

2. SHA错误修复（核心bug）

  • auto-approve.yml: 用 PR_HEAD_SHA (head.sha) 替代 GITHUB_SHA
  • auto-merge.yml: 用 PR_HEAD_SHA (head.sha) 替代 GITHUB_SHA
  • pull_request事件中GITHUB_SHA是merge commit虚拟SHA，CI实际上报的是head SHA

3. skipped/不存在check视为通过

  • check_ci_status.py: skipped状态返回success
  • check_ci_status.py: 找不到context返回success（没触发的workflow不用等）

影响

  • 解除PR自动合并且锁：之前12个runner 8个空闲但任务接不到
  • 修复auto-approve永远查不到CI状态的bug
## 修复内容 ### 1. 调度标签优化（解除死锁） - ci-cd.yml轻量job: ci-l1 → ci-check - auto-approve.yml: ci-l1 → ci-check - 所有runner都有ci-check标签，12个runner全可用 ### 2. SHA错误修复（核心bug） - auto-approve.yml: 用 PR_HEAD_SHA (head.sha) 替代 GITHUB_SHA - auto-merge.yml: 用 PR_HEAD_SHA (head.sha) 替代 GITHUB_SHA - pull_request事件中GITHUB_SHA是merge commit虚拟SHA，CI实际上报的是head SHA ### 3. skipped/不存在check视为通过 - check_ci_status.py: skipped状态返回success - check_ci_status.py: 找不到context返回success（没触发的workflow不用等） ## 影响 - 解除PR自动合并且锁：之前12个runner 8个空闲但任务接不到 - 修复auto-approve永远查不到CI状态的bug
xiaoxia added 4 commits 2026-07-17 16:22:41 +08:00
fix(ci): ci-l1→ci-check，解决调度死锁 95d64671c5
fix(ci): auto-approve用head sha查状态+ci-check标签 de05a3a11c
fix(ci): auto-merge用head sha查CI状态 bc0a42e3fc
fix(ci): skipped和不存在的check视为通过
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 / 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 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 / 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 / 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 12s
Details
AI Code Review / AI Code Review (pull_request) Failing after 41s
Details
CI/CD Pipeline / Frontend Lint (pull_request) Successful in 47s
Details
CI/CD Pipeline / Validate Code Quality And Tests (pull_request) Failing after 33s
Details
Auto Approve CI PRs / Auto Approve on CI Green (pull_request) Successful in 57s
Details
Auto Merge CI PRs / Auto Merge on CI Green + Approved (pull_request) Successful in 57s
Details
CI/CD Pipeline / Integration Tests (pull_request) Successful in 1m27s
Details
CI/CD Pipeline / Unit Tests (pull_request) Successful in 2m48s
Details
66b1add86e
xiaoxia added 1 commit 2026-07-17 16:57:00 +08:00
fix(ci): black格式化check_ci_status.py
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 / 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 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 / Staging API Integration Tests (pull_request) Has been skipped
Details
CI Build & Deploy Pipeline / Staging E2E 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 16s
Details
Auto Approve CI PRs / Auto Approve on CI Green (pull_request) Successful in 19s
Details
AI Code Review / AI Code Review (pull_request) Successful in 1m2s
Details
CI/CD Pipeline / Frontend Lint (pull_request) Successful in 1m5s
Details
CI/CD Pipeline / Validate Code Quality And Tests (pull_request) Successful in 3m22s
Details
CI/CD Pipeline / Unit Tests (pull_request) Successful in 3m48s
Details
CI/CD Pipeline / Integration Tests (pull_request) Successful in 2m6s
Details
Auto Merge CI PRs / Auto Merge on CI Green + Approved (pull_request) Successful in 5m49s
Details
9cd50aec6e
auto-approve-bot approved these changes 2026-07-17 16:57:18 +08:00
auto-approve-bot left a comment
Collaborator
Copy Link
Copy Source

CI全绿，自动审批通过。

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

CI全绿，自动审批通过。

CI全绿，自动审批通过。
auto-approve-bot merged commit a1960cae93 into develop 2026-07-17 17:02:48 +08:00
auto-approve-bot deleted branch ci/fix-sched-sha 2026-07-17 17:02:48 +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
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#478
Delete Branch "ci/fix-sched-sha"

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?