banlv/cozsweet-frontend-nextjs
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

refactor(release): replace git merge with git rebase for dev branch

Browse Source
This commit is contained in:
chenhang
2026-07-01 14:44:02 +08:00
parent 969a3b3f9f
commit e7a3bb2dc5
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
scripts/release/pre_release_web.sh
+2 -2
View File
@@ -19,8 +19,8 @@ cd "$WORKTREE_PATH" || { echo "错误: 无法进入 $WORKTREE_PATH"; exit 1; }
echo "=== 检查当前分支 ===" echo "=== 检查当前分支 ==="
git branch --show-current git branch --show-current
echo "=== 合并 dev 分支 ===" echo "=== 变基到 dev 分支 ==="
git merge dev git rebase dev
# 复制测试环境图标（source: $WORKTREE_PATH/icons/test → dest: $WORKTREE_PATH/public/） # 复制测试环境图标（source: $WORKTREE_PATH/icons/test → dest: $WORKTREE_PATH/public/）
echo "=== 复制测试环境图标（icons/test → public/） ===" echo "=== 复制测试环境图标（icons/test → public/） ==="
scripts/release/release_web.sh
+2 -2
View File
@@ -9,8 +9,8 @@ cd "$WORKTREE_PATH" || { echo "错误: 无法进入 $WORKTREE_PATH"; exit 1; }
echo "=== 检查当前分支 ===" echo "=== 检查当前分支 ==="
git branch --show-current git branch --show-current
echo "=== 合并 dev 分支 ===" echo "=== 变基到 dev 分支 ==="
git merge dev git rebase dev
# 复制生产环境图标（source: $WORKTREE_PATH/icons/production → dest: $WORKTREE_PATH/public/） # 复制生产环境图标（source: $WORKTREE_PATH/icons/production → dest: $WORKTREE_PATH/public/）
echo "=== 复制生产环境图标（icons/production → public/） ===" echo "=== 复制生产环境图标（icons/production → public/） ==="