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

chore: merge develop to main (Worker内存限制持久化) #71

Merged
xiaoxia merged 2 commits from develop into main 2026-06-28 13:07:50 +08:00
Conversation 0 Commits 2 Files Changed 3
+5 -5
xiaoxia commented 2026-06-28 13:07:44 +08:00
Owner
Copy Link
Copy Source

合并内容

将 develop 分支的最新修复合并到 main：

  • PR#70: Worker内存限制持久化 (mem_limit 2G)

变更文件

  • infra/docker/compose.yml: 添加 mem_limit 配置
## 合并内容 将 develop 分支的最新修复合并到 main： - PR#70: Worker内存限制持久化 (mem_limit 2G) ## 变更文件 - infra/docker/compose.yml: 添加 mem_limit 配置
xiaoxia added 2 commits 2026-06-28 13:07:44 +08:00
fix: resolve all TS6133 unused variable errors (Plans, ProjectGeneration, ProjectTasks)
CI/CD Pipeline / Validate Code Quality And Tests (pull_request) Has been cancelled
Details
CI/CD Pipeline / Frontend Lint (pull_request) Has been cancelled
Details
efc8d23b1d
Merge pull request 'fix: persist api/worker container memory limit with mem_limit 2g' (#70) from fix/compose-mem-limit into develop
Tests / test (pull_request) Failing after 1s
Details
Tests / lint (pull_request) Failing after 1s
Details
CI/CD Pipeline / Validate Code Quality And Tests (push) Has been cancelled
Details
CI/CD Pipeline / Frontend Lint (push) Has been cancelled
Details
Deploy / Deploy Staging (push) Has been cancelled
Details
Deploy / Build Production Runtime Images (push) Has been cancelled
Details
Deploy / Deploy Production (push) Has been cancelled
Details
Deploy / Production Browser E2E (push) Has been cancelled
Details
CI/CD Pipeline / Validate Code Quality And Tests (pull_request) Has been cancelled
Details
CI/CD Pipeline / Frontend Lint (pull_request) Has been cancelled
Details
996d193808
xiaoxia merged commit 40cbc6a010 into main 2026-06-28 13:07:50 +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
1 Participants
Notifications
Due Date
No due date set.
Dependencies

No dependencies set.

Reference: xiaoxia/xiaoxia-saas#71
Delete Branch "develop"

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?