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

feat(ci): Runner物理分层 - 构建任务专属旧服务器，新服务器跑CI门禁 #326

Merged
xiaoxia merged 1 commits from feat/ci-runner-layered into develop 2026-07-14 18:11:01 +08:00
Conversation 2 Commits 1 Files Changed 1
+6 -6
xiaoxia commented 2026-07-14 17:02:31 +08:00
Owner
Copy Link
Copy Source

背景

当前9个Runner混跑所有CI任务，构建任务（重CPU/IO）和门禁检查（轻量）互相挤占资源，导致门禁排队、构建也慢。

方案

物理分层：

  • 🔴 旧服务器（3个Runner）：专属跑镜像构建，标签 build-farm
  • 🟢 新服务器（6个Runner）：专属跑CI门禁检查，不带build-farm标签

改造内容：

  • 6个构建Job（3个Staging + 3个Production）的 runs-on 从 saas 改为 [saas, build-farm]
  • 门禁Job（Validate/Unit/Integration/Frontend Lint）保持 runs-on: host，天然只在新服务器跑（旧Runner无host标签）
  • 部署/E2E保持 runs-on: saas，两边都能调度

收益

  1. 门禁检查不再被构建任务挤占，PR反馈更快
  2. 构建任务专属旧服务器，资源稳定
  3. 新服务器6个Runner全力跑检查，并行度高

变更范围

.gitea/workflows/ci-cd.yml：6个构建Job的runs-on配置

## 背景 当前9个Runner混跑所有CI任务，构建任务（重CPU/IO）和门禁检查（轻量）互相挤占资源，导致门禁排队、构建也慢。 ## 方案 **物理分层：** - 🔴 **旧服务器（3个Runner）**：专属跑镜像构建，标签 `build-farm` - 🟢 **新服务器（6个Runner）**：专属跑CI门禁检查，不带build-farm标签 **改造内容：** - 6个构建Job（3个Staging + 3个Production）的 `runs-on` 从 `saas` 改为 `[saas, build-farm]` - 门禁Job（Validate/Unit/Integration/Frontend Lint）保持 `runs-on: host`，天然只在新服务器跑（旧Runner无host标签） - 部署/E2E保持 `runs-on: saas`，两边都能调度 ## 收益 1. 门禁检查不再被构建任务挤占，PR反馈更快 2. 构建任务专属旧服务器，资源稳定 3. 新服务器6个Runner全力跑检查，并行度高 ## 变更范围 `.gitea/workflows/ci-cd.yml`：6个构建Job的runs-on配置
xiaoxia added 1 commit 2026-07-14 17:02:31 +08:00
feat(ci): Runner物理分层 - 构建任务只调度到旧服务器
CI/CD Pipeline / Validate Code Quality And Tests (pull_request) Successful in 1m16s
Details
CI/CD Pipeline / Unit Tests (pull_request) Successful in 1m26s
Details
CI/CD Pipeline / Integration Tests (pull_request) Successful in 1m8s
Details
CI/CD Pipeline / Frontend Lint (pull_request) Successful in 2m56s
Details
CI/CD Pipeline / Build Staging API Image (pull_request) Has been skipped
Details
CI/CD Pipeline / Build Staging Worker Image (pull_request) Has been skipped
Details
CI/CD Pipeline / Build Staging Web Image (pull_request) Has been skipped
Details
CI/CD Pipeline / Build Production API Image (pull_request) Has been skipped
Details
CI/CD Pipeline / Build Production Worker Image (pull_request) Has been skipped
Details
CI/CD Pipeline / Build Production Web Image (pull_request) Has been skipped
Details
CI/CD Pipeline / Deploy Staging (Watchtower auto-deploy) (pull_request) Has been skipped
Details
CI/CD Pipeline / Staging API Integration Tests (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
6db705a05d 
将6个构建Job（Staging+Production）的runs-on从saas改为[saas, build-farm]，
只有带build-farm标签的旧服务器Runner能接构建任务，新服务器6个Runner
专注跑CI门禁检查，实现真正的物理分层，避免构建任务挤占CI检查资源。
auto-approve-bot reviewed 2026-07-14 17:31:36 +08:00
auto-approve-bot left a comment
Collaborator
Copy Link
Copy Source

CI全绿，自动审批通过。

CI全绿，自动审批通过。
xiaoxia reviewed 2026-07-14 18:09:39 +08:00
xiaoxia left a comment
Author
Owner
Copy Link
Copy Source

CI全绿，Runner物理分层方案确认通过

CI全绿，Runner物理分层方案确认通过
xiaoxia merged commit 7f767e2dd1 into develop 2026-07-14 18:11:01 +08:00
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
2 Participants
Notifications
Due Date
No due date set.
Dependencies

No dependencies set.

Reference: xiaoxia/xiaoxia-saas#326
Delete Branch "feat/ci-runner-layered"

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?