chore: 统一所有环境分支为main分支

- 将Gitea (canary)仓库的develop分支重命名为main
- 将Bitbucket (dev)仓库的develop分支重命名为main
- 更新部署脚本和文档以使用main分支
- 删除本地develop分支

所有环境现在统一使用main分支,简化渐进发布流程
This commit is contained in:
ben 2025-08-30 14:46:59 +00:00
parent cf14f606db
commit 7dd48c5781
3 changed files with 16 additions and 18 deletions

View File

@ -20,22 +20,22 @@
```bash
# 在 canary 环境开发新功能
git checkout develop
git pull canary develop
git checkout main
git pull canary main
# 开发完成后
git add .
git commit -m "feat: 新功能描述"
git push canary develop
git push canary main
```
### 2. 集成测试流程
```bash
# 将功能从 canary 推送到 dev 环境
git checkout dev
git checkout main
git pull dev main
git merge develop
git push dev dev:main
git merge main
git push dev main
```
### 3. 预发布流程
@ -44,7 +44,7 @@ git push dev dev:main
# 将功能从 dev 推送到 beta 环境
git checkout main
git pull beta main
git merge dev
git merge main
git push beta main
```
@ -84,9 +84,7 @@ git push beta main
## 分支策略
- **develop**: 金丝雀环境主分支
- **dev**: 开发环境主分支
- **main**: 测试环境主分支
- **main**: 所有环境统一使用main分支
## 标签命名

View File

@ -12,14 +12,14 @@ fi
case $ENV in
canary)
git checkout develop
git checkout main
git tag "v${VERSION}-canary"
git push canary develop --tags
git push canary main --tags
;;
dev)
git checkout dev
git checkout main
git tag "v${VERSION}-dev"
git push dev dev:main --tags
git push dev main --tags
;;
beta)
git checkout main

View File

@ -12,14 +12,14 @@ fi
case $ENV in
canary)
git checkout develop
git checkout main
git reset --hard "v${VERSION}-canary"
git push canary develop --force
git push canary main --force
;;
dev)
git checkout dev
git checkout main
git reset --hard "v${VERSION}-dev"
git push dev dev:main --force
git push dev main --force
;;
beta)
git checkout main