From 7dd48c5781758351f7d0a20fb9a24d395d244d78 Mon Sep 17 00:00:00 2001
From: ben <ben@capitaltrain.cn>
Date: Sat, 30 Aug 2025 14:46:59 +0000
Subject: [PATCH] =?UTF-8?q?chore:=20=E7=BB=9F=E4=B8=80=E6=89=80=E6=9C=89?=
 =?UTF-8?q?=E7=8E=AF=E5=A2=83=E5=88=86=E6=94=AF=E4=B8=BAmain=E5=88=86?=
 =?UTF-8?q?=E6=94=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

所有环境现在统一使用main分支，简化渐进发布流程
---
 docs/development/CANARY_DEV_BETA_DEPLOYMENT.md | 18 ++++++++----------
 scripts/quick-release.sh                       |  8 ++++----
 scripts/rollback.sh                            |  8 ++++----
 3 files changed, 16 insertions(+), 18 deletions(-)

diff --git a/docs/development/CANARY_DEV_BETA_DEPLOYMENT.md b/docs/development/CANARY_DEV_BETA_DEPLOYMENT.md
index 9549d50..836bdf4 100644
--- a/docs/development/CANARY_DEV_BETA_DEPLOYMENT.md
+++ b/docs/development/CANARY_DEV_BETA_DEPLOYMENT.md
@@ -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分支
 
 ## 标签命名
 
diff --git a/scripts/quick-release.sh b/scripts/quick-release.sh
index ae9888f..77607b1 100755
--- a/scripts/quick-release.sh
+++ b/scripts/quick-release.sh
@@ -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
diff --git a/scripts/rollback.sh b/scripts/rollback.sh
index 7285c45..7ed6826 100755
--- a/scripts/rollback.sh
+++ b/scripts/rollback.sh
@@ -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