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

chore(ci): P2端口收尾同步到main分支 (#798 #799) #853

Merged
xiaoxia merged 2 commits from chore/ci-ports-main-sync into main 2026-07-24 23:54:09 +08:00
Conversation 2 Commits 2 Files Changed 3
+142 -2
xiaoxia commented 2026-07-24 22:02:33 +08:00
Owner
Copy Link
Copy Source

背景

将develop分支的P2端口收尾改动同步到main，保持CI配置一致。

变更内容

从develop cherry-pick以下两个PR到main：

1. #841 端口分配清单文档 (#798)

  • 新增 docs/PORTS.md - 统一端口分配清单（140行）
  • 覆盖API/Web/PG/Redis/Registry/ChatOps等全部端口

2. #845 端口变量命名统一 (#799)

  • scripts/ci/chatops/config.py: WEBHOOK_PORT → CHATOPS_WEBHOOK_PORT
  • scripts/ci/chatops/webhook_server.py: 同步修改引用

说明

ci-pipeline.yml的CI_PG_PORT→CI_LOCAL_PG_PORT改动未同步：main分支的ci-pipeline.yml没有顶层env块，DATABASE_URL是硬编码的，该改动不适用于main。后续如果main的CI配置与develop对齐，再同步此改动。

影响

  • ✅ 纯文档 + CI脚本变量重命名，不影响业务
  • ✅ 变量值不变，功能无变化
## 背景 将develop分支的P2端口收尾改动同步到main，保持CI配置一致。 ## 变更内容 从develop cherry-pick以下两个PR到main： ### 1. #841 端口分配清单文档 (#798) - 新增 `docs/PORTS.md` - 统一端口分配清单（140行） - 覆盖API/Web/PG/Redis/Registry/ChatOps等全部端口 ### 2. #845 端口变量命名统一 (#799) - `scripts/ci/chatops/config.py`: `WEBHOOK_PORT` → `CHATOPS_WEBHOOK_PORT` - `scripts/ci/chatops/webhook_server.py`: 同步修改引用 ### 说明 **ci-pipeline.yml的CI_PG_PORT→CI_LOCAL_PG_PORT改动未同步**：main分支的ci-pipeline.yml没有顶层env块，DATABASE_URL是硬编码的，该改动不适用于main。后续如果main的CI配置与develop对齐，再同步此改动。 ## 影响 - ✅ 纯文档 + CI脚本变量重命名，不影响业务 - ✅ 变量值不变，功能无变化
xiaoxia self-assigned this 2026-07-24 22:02:33 +08:00
xiaoxia added 2 commits 2026-07-24 22:02:33 +08:00
docs: 新增统一端口分配清单文档 (#798) (#841) add422f51b
chore(ci): 端口变量命名统一 (#799) (#845)
CI/CD Pipeline / Check if frontend-only change (pull_request) Successful in 16s
Details
CI/CD Pipeline / Validate - Type Check (mypy) (pull_request) Successful in 57s
Details
CI/CD Pipeline / Validate - Migration (alembic) (pull_request) Successful in 43s
Details
CI/CD Pipeline / Frontend Lint (pull_request) Successful in 23s
Details
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 / PR Build Web Image (pull_request) Successful in 36s
Details
PR Automation / Auto Merge on CI Green + Approved (pull_request) Has been skipped
Details
CI/CD Pipeline / PR Build API Image (pull_request) Successful in 50s
Details
CI/CD Pipeline / Frontend Unit Tests (pull_request) Has been skipped
Details
Preview Deploy / Deploy Preview Environment (pull_request) Failing after 24s
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
AI Code Review / AI Code Review (pull_request) Successful in 1m27s
Details
CI/CD Pipeline / Validate - Code Quality (pull_request) Successful in 4m4s
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
PR Automation / Auto Approve on CI Green (pull_request) Successful in 3m13s
Details
CI/CD Pipeline / PR Build Worker Image (pull_request) Successful in 3m50s
Details
CI/CD Pipeline / Unit Tests (pull_request) Successful in 4m7s
Details
CI/CD Pipeline / Production Browser E2E (pull_request) Has been skipped
Details
CI/CD Pipeline / Integration Tests (pull_request) Successful in 3m19s
Details
Preview Cleanup / Cleanup Preview Environment (pull_request) Successful in 29s
Details
6c9c7155ea
xiaoxia reviewed 2026-07-24 23:53:32 +08:00
xiaoxia left a comment
Author
Owner
Copy Link
Copy Source

CI核心门禁全绿，纯文档+CI配置改动，批准合并。

CI核心门禁全绿，纯文档+CI配置改动，批准合并。
xiaoxia merged commit f03c9d5453 into main 2026-07-24 23:54:09 +08:00
xiaoxia deleted branch chore/ci-ports-main-sync 2026-07-24 23:54:09 +08:00
gitea-actions bot commented 2026-07-24 23:54:37 +08:00
Copy Link
Copy Source

🗑️ 预览环境已清理

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

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

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

No dependencies set.

Reference: xiaoxia/xiaoxia-saas#853
Delete Branch "chore/ci-ports-main-sync"

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?