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

ci: 优化镜像 tag 策略 - develop 用 dev 固定 tag 覆盖推送，feature 分支跳过部署 #195

Closed
xiaoxia wants to merge 1 commits from feature/optimize-docker-tags into develop
pull from: feature/optimize-docker-tags
merge into: xiaoxia:develop
Conversation 0 Commits 1 Files Changed 1
+17 -3
xiaoxia commented 2026-07-09 13:33:43 +08:00
Owner
Copy Link
Copy Source

改动摘要

1. develop 分支改用固定 :dev tag（覆盖推送）

  • 之前：每次推送产生一个新的 SHA tag（累积大量镜像）
  • 现在：用固定的 dev tag 覆盖推送，不累积版本
  • 同时继续推送 :staging tag 供 Watchtower 自动部署

2. feature/* 分支跳过 Docker 镜像部署

  • deploy-staging job 不再触发 feature/* 分支
  • 避免 feature 分支污染 staging 环境和产生多余镜像 tag
  • feature 分支仍会跑 validate + frontend-lint 做代码质量检查

3. main 分支保持不变

  • 继续使用 SHA tag + staging tag
  • staging 环境部署逻辑不变

4. production 相关 job 完全不动

  • build-production-runtime-images（v* tag 触发）保持不变
  • deploy-production 保持不变
  • production-e2e 保持不变

验证方式

合并到 develop 后，触发一次 CI，确认：

  1. deploy-staging job 正常执行
  2. 镜像 tag 为 dev（而非 SHA）
  3. Watchtower 正常拉取更新
  4. smoke test 通过
## 改动摘要 ### 1. develop 分支改用固定 :dev tag（覆盖推送） - 之前：每次推送产生一个新的 SHA tag（累积大量镜像） - 现在：用固定的 `dev` tag 覆盖推送，不累积版本 - 同时继续推送 `:staging` tag 供 Watchtower 自动部署 ### 2. feature/* 分支跳过 Docker 镜像部署 - deploy-staging job 不再触发 feature/* 分支 - 避免 feature 分支污染 staging 环境和产生多余镜像 tag - feature 分支仍会跑 validate + frontend-lint 做代码质量检查 ### 3. main 分支保持不变 - 继续使用 SHA tag + staging tag - staging 环境部署逻辑不变 ### 4. production 相关 job 完全不动 - build-production-runtime-images（v* tag 触发）保持不变 - deploy-production 保持不变 - production-e2e 保持不变 ## 验证方式 合并到 develop 后，触发一次 CI，确认： 1. deploy-staging job 正常执行 2. 镜像 tag 为 `dev`（而非 SHA） 3. Watchtower 正常拉取更新 4. smoke test 通过
xiaoxia added 1 commit 2026-07-09 13:33:43 +08:00
ci: 优化镜像 tag 策略 - develop 用 dev 固定 tag 覆盖推送，feature 分支跳过部署
CI/CD Pipeline / Frontend Lint (push) Successful in 1m56s
Details
CI/CD Pipeline / Frontend Lint (pull_request) Successful in 2m40s
Details
CI/CD Pipeline / Validate Code Quality And Tests (push) Failing after 10m1s
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 / Staging API Integration 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
CI/CD Pipeline / Validate Code Quality And Tests (pull_request) Failing after 10m2s
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 / Staging API Integration 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
c678ca387b
xiaoxia closed this pull request 2026-07-15 07:39:13 +08:00
Some checks are pending
CI/CD Pipeline / Frontend Lint (push) Successful in 1m56s
Details
CI/CD Pipeline / Frontend Lint (pull_request) Successful in 2m40s
Details
CI/CD Pipeline / Validate Code Quality And Tests (push) Failing after 10m1s
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 / Staging API Integration 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
CI/CD Pipeline / Validate Code Quality And Tests (pull_request) Failing after 10m2s
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 / Staging API Integration 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

Pull request closed

Please reopen this pull request to perform a merge.
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#195
Delete Branch "feature/optimize-docker-tags"

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?