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

fix: check_ci_status按时间取最新status，修复auto-merge一直等pending的bug #698

Merged
xiaoxia merged 1 commits from fix/check-ci-status-order into develop 2026-07-22 08:58:00 +08:00
Conversation 5 Commits 1 Files Changed 1
+15 -13
xiaoxia commented 2026-07-22 08:43:38 +08:00
Owner
Copy Link
Copy Source

问题

auto-merge workflow里的check_ci_status.py假设statuses API按时间倒序返回，但Gitea实际是正序（旧→新）。导致取到第一条是最早的pending状态，一直等不到success，最终超时。

修复

用max()按created_at取最新的一条status，确保拿到的是最终状态。

影响

  • auto-merge和auto-approve都依赖这个脚本
  • 修复后auto-merge能正确识别CI已通过的PR，不会再出现「全绿但不合并」的情况（之前#691 #694 #696都遇到了）
## 问题 auto-merge workflow里的check_ci_status.py假设statuses API按时间倒序返回，但Gitea实际是正序（旧→新）。导致取到第一条是最早的pending状态，一直等不到success，最终超时。 ## 修复 用max()按created_at取最新的一条status，确保拿到的是最终状态。 ## 影响 - auto-merge和auto-approve都依赖这个脚本 - 修复后auto-merge能正确识别CI已通过的PR，不会再出现「全绿但不合并」的情况（之前#691 #694 #696都遇到了）
xiaoxia added 1 commit 2026-07-22 08:43:39 +08:00
fix: check_ci_status按创建时间取最新status，修复auto-merge误等pending的bug
CI/CD Pipeline / Build Staging API Image (pull_request) Has been skipped
Details
CI/CD Pipeline / Build Staging Web Image (pull_request) Has been skipped
Details
CI/CD Pipeline / Build Staging Worker Image (pull_request) Has been skipped
Details
CI/CD Pipeline / Check if frontend-only change (pull_request) Successful in 30s
Details
CI/CD Pipeline / Frontend Lint (pull_request) Successful in 1m12s
Details
Preview Deploy / Deploy Preview Environment (pull_request) Successful in 45s
Details
CI/CD Pipeline / PR Build Web Image (pull_request) Successful in 2m39s
Details
CI/CD Pipeline / PR Build API Image (pull_request) Successful in 3m45s
Details
CI/CD Pipeline / Build Production API Image (pull_request) Has been skipped
Details
CI/CD Pipeline / Build Production Web Image (pull_request) Has been skipped
Details
CI/CD Pipeline / Build Production Worker Image (pull_request) Has been skipped
Details
CI/CD Pipeline / Deploy Staging (Watchtower auto-deploy) (pull_request) Has been skipped
Details
CI/CD Pipeline / Frontend Unit Tests (pull_request) Has been skipped
Details
CI/CD Pipeline / Validate Code Quality And Tests (pull_request) Successful in 1m45s
Details
PR Automation / Auto Approve on CI Green (pull_request) Successful in 4m34s
Details
AI Code Review / AI Code Review (pull_request) Successful in 5m58s
Details
CI/CD Pipeline / Unit Tests (pull_request) Successful in 3m28s
Details
CI/CD Pipeline / Deploy Production (pull_request) Has been skipped
Details
CI/CD Pipeline / Staging E2E Tests (pull_request) Has been skipped
Details
CI/CD Pipeline / Staging API Integration Tests (pull_request) Has been skipped
Details
CI/CD Pipeline / ACR Image Cleanup (pull_request) Has been skipped
Details
CI/CD Pipeline / PR Build Worker Image (pull_request) Successful in 8m8s
Details
CI/CD Pipeline / Production Browser E2E (pull_request) Has been skipped
Details
Preview Cleanup / Cleanup Preview Environment (pull_request) Successful in 29s
Details
CI/CD Pipeline / Integration Tests (pull_request) Successful in 1m18s
Details
PR Automation / Auto Merge on CI Green + Approved (pull_request) Successful in 38m58s
Details
b5b15d1f76
gitea-actions bot commented 2026-07-22 08:47:18 +08:00
Copy Link
Copy Source

🚀 预览环境已部署

项目 详情
PR号 #698
预览链接 https://pr-698.preview.xiaoxiajianji.com
API环境 staging

💡 预览环境使用 staging API 数据，请勿在预览环境中操作重要数据。

🔄 每次提交新代码后预览环境会自动更新。

🗑️ PR 关闭或合并后，预览环境会自动清理。

🚀 **预览环境已部署** | 项目 | 详情 | |------|------| | PR号 | #698 | | 预览链接 | [https://pr-698.preview.xiaoxiajianji.com](https://pr-698.preview.xiaoxiajianji.com) | | API环境 | staging | > 💡 预览环境使用 staging API 数据，请勿在预览环境中操作重要数据。 > > 🔄 每次提交新代码后预览环境会自动更新。 > > 🗑️ PR 关闭或合并后，预览环境会自动清理。
auto-approve-bot approved these changes 2026-07-22 08:50:07 +08:00
auto-approve-bot left a comment
Collaborator
Copy Link
Copy Source

CI全绿，自动审批通过。

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

CI全绿，自动审批通过。

CI全绿，自动审批通过。
auto-approve-bot commented 2026-07-22 08:51:26 +08:00
Collaborator
Copy Link
Copy Source

代码审查结果 - PR #698

⚠️ 问题（1个需要修改）

  1. scripts/check_ci_status.py 第43行：max(matching, key=lambda s: s.get("created_at", "")) 存在严重的逻辑隐患。如果 API 返回的最新状态记录中缺失 created_at 字段，该记录的 key 将回退为空字符串 ""。在字符串比较中，"" 小于任何有效的时间戳字符串，导致 max 函数错误地选择了时间戳较早的旧记录，从而使脚本输出过时的 CI 状态，可能导致 CI 判断错误。

💡 建议（1个可选）

  1. 代码注释提到“Gitea statuses API按时间正序返回”，如果此 API 行为稳定，建议直接使用 matching[-1] 获取最新记录。这不仅避免了字段缺失导致的排序错误，逻辑也更简洁，且时间复杂度从 O(N) 降低为 O(1)。

✅ 格式检查通过 | ❌ 逻辑审查需修改 | ✅ 性能无明显问题

🤖 由 AI 代码审查机器人自动生成 | 2026-07-22 08:51:26 | 模型:

## 代码审查结果 - PR #698 ### ⚠️ 问题（1个需要修改） 1. **scripts/check_ci_status.py 第43行**：`max(matching, key=lambda s: s.get("created_at", ""))` 存在严重的逻辑隐患。如果 API 返回的最新状态记录中缺失 `created_at` 字段，该记录的 key 将回退为空字符串 `""`。在字符串比较中，`""` 小于任何有效的时间戳字符串，导致 `max` 函数错误地选择了时间戳较早的旧记录，从而使脚本输出过时的 CI 状态，可能导致 CI 判断错误。 ### 💡 建议（1个可选） 1. 代码注释提到“Gitea statuses API按时间正序返回”，如果此 API 行为稳定，建议直接使用 `matching[-1]` 获取最新记录。这不仅避免了字段缺失导致的排序错误，逻辑也更简洁，且时间复杂度从 O(N) 降低为 O(1)。 --- ✅ 格式检查通过 | ❌ 逻辑审查需修改 | ✅ 性能无明显问题 --- <sub>🤖 由 AI 代码审查机器人自动生成 | 2026-07-22 08:51:26 | 模型: </sub> <!-- AI_CODE_REVIEW_AUTO_COMMENT -->
xiaoxia merged commit 809339fee3 into develop 2026-07-22 08:58:00 +08:00
gitea-actions bot commented 2026-07-22 08:59:49 +08:00
Copy Link
Copy Source

🗑️ 预览环境已清理

PR #698 已关闭或合并，对应的预览环境已被清理。

如有需要，可以重新打开 PR 来重新生成预览环境。

🗑️ **预览环境已清理** PR #698 已关闭或合并，对应的预览环境已被清理。 > 如有需要，可以重新打开 PR 来重新生成预览环境。
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
3 Participants
Notifications
Due Date
No due date set.
Dependencies

No dependencies set.

Reference: xiaoxia/xiaoxia-saas#698
Delete Branch "fix/check-ci-status-order"

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?