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

fix(ci): 修复auto-merge checkout缓存损坏 + 清理老合并脚本 #483

Closed
xiaoxia wants to merge 19 commits from fix/auto-merge-checkout-and-legacy-cleanup into develop
pull from: fix/auto-merge-checkout-and-legacy-cleanup
merge into: xiaoxia:develop
Conversation 0 Commits 19 Files Changed 8
+429 -128
xiaoxia commented 2026-07-17 19:52:23 +08:00
Owner
Copy Link
Copy Source

背景

PR #482 暴露了 auto-merge 相关的两个问题：

  1. auto-merge.yml 和 auto-approve.yml 仍使用 actions/checkout@v3，runner 本地缓存损坏会导致 job 直接挂掉
  2. 存在两套合并机制：CI 内置的 auto-merge.yml + 老脚本 scripts/auto_merge_prs.sh（可能还在 crontab 跑）

变更内容

1. 修复 checkout 缓存损坏问题

将 .gitea/workflows/auto-approve.yml 和 .gitea/workflows/auto-merge.yml 中的 actions/checkout@v3 替换为与 ci-cd.yml 一致的 tar.gz 下载方式（python3 + urllib + tarfile）：

  • 绕过 actions/checkout 的本地 git 缓存，避免缓存损坏导致 job 失败
  • 支持 5 次重试 + 指数退避，网络抖动时更稳定
  • 保持原有业务逻辑完全不变

2. 清理老合并脚本

删除 scripts/auto_merge_prs.sh，该脚本已由 .gitea/workflows/auto-merge.yml 完全替代。

调查结论（基于 Gitea API 审计）：

  • 7月14日 auto-approve-bot 用户创建之前，所有自动合并 PR 的 merged_by 均为 xiaoxia（老脚本使用管理员 token）
  • 7月17日起，所有自动合并 PR 的 merged_by 均为 auto-approve-bot（CI workflow 使用的 bot token）
  • 过渡期（7月15-16日）两种方式并存，7月17日后 CI 内置版已完全接管
  • 因 SSH 不可用未能直接验证服务器 crontab，但从合并审计数据看老脚本已无实际作用

CI 内置版相对老脚本的优势：

  • 触发更及时：PR 事件即时触发 vs crontab 轮询
  • 更多 CI 检查项：4 门禁（含集成测试） vs 2 门禁
  • 更安全的合并方式：squash merge + 自动删源分支 vs 普通 merge
  • 与审批流程联动：必须有 approval 才合并

影响范围

  • 仅修改 CI workflow 的 checkout 方式，业务逻辑不变
  • 删除已废弃的脚本文件，无运行时影响
## 背景 PR #482 暴露了 auto-merge 相关的两个问题： 1. `auto-merge.yml` 和 `auto-approve.yml` 仍使用 `actions/checkout@v3`，runner 本地缓存损坏会导致 job 直接挂掉 2. 存在两套合并机制：CI 内置的 `auto-merge.yml` + 老脚本 `scripts/auto_merge_prs.sh`（可能还在 crontab 跑） ## 变更内容 ### 1. 修复 checkout 缓存损坏问题 将 `.gitea/workflows/auto-approve.yml` 和 `.gitea/workflows/auto-merge.yml` 中的 `actions/checkout@v3` 替换为与 `ci-cd.yml` 一致的 tar.gz 下载方式（python3 + urllib + tarfile）： - 绕过 actions/checkout 的本地 git 缓存，避免缓存损坏导致 job 失败 - 支持 5 次重试 + 指数退避，网络抖动时更稳定 - 保持原有业务逻辑完全不变 ### 2. 清理老合并脚本 删除 `scripts/auto_merge_prs.sh`，该脚本已由 `.gitea/workflows/auto-merge.yml` 完全替代。 **调查结论（基于 Gitea API 审计）：** - 7月14日 `auto-approve-bot` 用户创建之前，所有自动合并 PR 的 `merged_by` 均为 `xiaoxia`（老脚本使用管理员 token） - 7月17日起，所有自动合并 PR 的 `merged_by` 均为 `auto-approve-bot`（CI workflow 使用的 bot token） - 过渡期（7月15-16日）两种方式并存，7月17日后 CI 内置版已完全接管 - 因 SSH 不可用未能直接验证服务器 crontab，但从合并审计数据看老脚本已无实际作用 **CI 内置版相对老脚本的优势：** - 触发更及时：PR 事件即时触发 vs crontab 轮询 - 更多 CI 检查项：4 门禁（含集成测试） vs 2 门禁 - 更安全的合并方式：squash merge + 自动删源分支 vs 普通 merge - 与审批流程联动：必须有 approval 才合并 ## 影响范围 - 仅修改 CI workflow 的 checkout 方式，业务逻辑不变 - 删除已废弃的脚本文件，无运行时影响
xiaoxia added 19 commits 2026-07-17 19:52:23 +08:00
Merge develop into main - v0.1.121
CI/CD Pipeline / Validate Code Quality And Tests (push) Failing after 52h48m47s
Details
CI/CD Pipeline / Frontend Lint (push) Failing after 52h48m2s
Details
CI/CD Pipeline / Deploy Staging (push) Failing after 52h46m33s
Details
CI/CD Pipeline / Staging E2E Tests (push) Failing after 52h45m33s
Details
CI/CD Pipeline / Build Production Runtime Images (push) Has been skipped
Details
CI/CD Pipeline / Deploy Production (push) Has been skipped
Details
CI/CD Pipeline / Production Browser E2E (push) Has been skipped
Details
1d59ee5336
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 / Deploy Staging (push) Has been skipped
Details
CI/CD Pipeline / Staging E2E Tests (push) Has been skipped
Details
CI/CD Pipeline / Build Production Runtime Images (push) Has been skipped
Details
CI/CD Pipeline / Deploy Production (push) Has been skipped
Details
CI/CD Pipeline / Production Browser E2E (push) Has been skipped
Details
dbd956fc6e
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 / Deploy Staging (push) Has been skipped
Details
CI/CD Pipeline / Staging E2E Tests (push) Has been skipped
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
2371860f82
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 / Staging E2E Tests (push) Has been skipped
Details
CI/CD Pipeline / Build Production Runtime Images (push) Has been skipped
Details
CI/CD Pipeline / Deploy Production (push) Has been skipped
Details
CI/CD Pipeline / Production Browser E2E (push) Has been skipped
Details
d213a055a1
Merge develop into main - v0.1.124
CI/CD Pipeline / Validate Code Quality And Tests (push) Failing after 45h17m30s
Details
CI/CD Pipeline / Frontend Lint (push) Failing after 45h17m8s
Details
CI/CD Pipeline / Deploy Staging (push) Failing after 45h15m38s
Details
CI/CD Pipeline / Staging E2E Tests (push) Has been skipped
Details
CI/CD Pipeline / Build Production Runtime Images (push) Has been skipped
Details
CI/CD Pipeline / Deploy Production (push) Has been skipped
Details
CI/CD Pipeline / Production Browser E2E (push) Has been skipped
Details
8748b43070
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) Has been skipped
Details
CI/CD Pipeline / Staging E2E Tests (push) Has been skipped
Details
CI/CD Pipeline / Build Production Runtime Images (push) Has been skipped
Details
CI/CD Pipeline / Deploy Production (push) Has been skipped
Details
CI/CD Pipeline / Production Browser E2E (push) Has been skipped
Details
9b034764ad
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 / Build & Push Staging (Watchtower auto-deploy) (push) Has been skipped
Details
CI/CD Pipeline / Staging E2E Tests (push) Has been skipped
Details
CI/CD Pipeline / Build Production Runtime Images (push) Has been skipped
Details
CI/CD Pipeline / Deploy Production (push) Has been skipped
Details
CI/CD Pipeline / Production Browser E2E (push) Has been skipped
Details
708662394f
test: trigger workflow after gitea upgrade
CI/CD Pipeline / Build Production Runtime Images (push) Has been skipped
Details
CI/CD Pipeline / Deploy Production (push) Has been skipped
Details
CI/CD Pipeline / Production Browser E2E (push) Has been skipped
Details
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
0d4904433e
cleanup: remove upgrade test file
CI/CD Pipeline / Build Production Runtime Images (push) Has been skipped
Details
CI/CD Pipeline / Deploy Production (push) Has been skipped
Details
CI/CD Pipeline / Production Browser E2E (push) Has been skipped
Details
CI/CD Pipeline / Staging E2E Tests (push) Has been skipped
Details
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
ef344e9ffc
ci: remove temporary debug workflow - test-ssh-secret.yml
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) Has been skipped
Details
CI/CD Pipeline / Build Production Runtime Images (push) Has been skipped
Details
CI/CD Pipeline / Staging E2E Tests (push) Has been skipped
Details
CI/CD Pipeline / Deploy Production (push) Has been skipped
Details
CI/CD Pipeline / Production Browser E2E (push) Has been skipped
Details
Fix Flake8 E741 for PR232 / fix-flake8 (push) Failing after 3h4m59s
Details
0c9375ff32
fix(ci): 修复auto-merge缺少GITEA_API_TOKEN环境变量
CI/CD Pipeline / Frontend Lint (push) Successful in 58s
Details
CI/CD Pipeline / Validate Code Quality And Tests (push) Successful in 1m36s
Details
CI/CD Pipeline / Build Production Runtime Images (push) Has been skipped
Details
CI/CD Pipeline / Deploy Production (push) Has been skipped
Details
CI/CD Pipeline / Production Browser E2E (push) Has been skipped
Details
CI/CD Pipeline / Build & Push Staging (Watchtower auto-deploy) (push) Failing after 7s
Details
CI/CD Pipeline / Staging E2E Tests (push) Has been skipped
Details
df08161630 
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相关测试失败
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
7e5e412f7f 
- 触发方式：pull_request事件（CI状态变更时）
- 合并条件：2门禁全绿 + 至少1个APPROVED + 无冲突 + 非草稿
- 安全措施：幂等保护、合并失败留评论、只合main
- 新增check_ci_status.py和check_pr_approval.py辅助脚本
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
728db0faf8
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
a1a272b833
Merge pull request 'feat(ci): main分支auto-merge从定时改为即时合并' (#464) from ci/main-auto-merge-instant into main
CI/CD Pipeline / Validate Code Quality And Tests (push) Successful in 2m10s
Details
CI/CD Pipeline / Frontend Lint (push) Successful in 2m12s
Details
CI/CD Pipeline / Build Production Runtime Images (push) Has been skipped
Details
CI/CD Pipeline / Deploy Production (push) Has been skipped
Details
CI/CD Pipeline / Production Browser E2E (push) Has been skipped
Details
CI/CD Pipeline / Build & Push Staging (Watchtower auto-deploy) (push) Failing after 4s
Details
CI/CD Pipeline / Staging E2E Tests (push) Has been skipped
Details
b3ef7bb041
fix(ci): main??auto-merge/approve????Tests/test??
CI/CD Pipeline / Validate Code Quality And Tests (push) Successful in 2m0s
Details
CI/CD Pipeline / Frontend Lint (push) Successful in 2m10s
Details
CI/CD Pipeline / Build Production Runtime Images (push) Has been skipped
Details
CI/CD Pipeline / Deploy Production (push) Has been skipped
Details
CI/CD Pipeline / Production Browser E2E (push) Has been skipped
Details
CI/CD Pipeline / Build & Push Staging (Watchtower auto-deploy) (push) Failing after 3s
Details
CI/CD Pipeline / Staging E2E Tests (push) Has been skipped
Details
dfb2feef8a 
- auto-merge.yml: main????Tests/test,?3???????
- auto-approve.yml: main??????????Tests/test
- ??#464???Tests/test???????????
fix(ci): auto-approve checkout改用tar.gz方式，避免缓存损坏 62cce38d75
fix(ci): auto-merge checkout改用tar.gz方式，避免缓存损坏 d748e079f5
cleanup(ci): 删除老的auto_merge_prs.sh脚本，已由auto-merge.yml完全接管
CI/CD Pipeline / Validate Code Quality And Tests (pull_request) Successful in 2m2s
Details
CI/CD Pipeline / Frontend Lint (pull_request) Successful in 2m2s
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 20m51s
Details
Auto Merge CI PRs / Auto Merge on CI Green + Approved (pull_request) Successful in 32m15s
Details
b443179d78
xiaoxia closed this pull request 2026-07-17 19:53:56 +08:00
Some checks are pending
CI/CD Pipeline / Validate Code Quality And Tests (pull_request) Successful in 2m2s
Details
CI/CD Pipeline / Frontend Lint (pull_request) Successful in 2m2s
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 20m51s
Details
Auto Merge CI PRs / Auto Merge on CI Green + Approved (pull_request) Successful in 32m15s
Details

Pull request closed

This pull request cannot be reopened because the branch was deleted.
Sign in to join this conversation.
Reviewers
No Reviewers
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
1 Participants
Notifications
Due Date
No due date set.
Dependencies

No dependencies set.

Reference: xiaoxia/xiaoxia-saas#483
Delete Branch "fix/auto-merge-checkout-and-legacy-cleanup"

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?