Skip to content

Commit 0e651e3

Browse files
committed
fix: reuse branch for releases
1 parent b131f8b commit 0e651e3

File tree

1 file changed

+7
-9
lines changed

1 file changed

+7
-9
lines changed

.github/workflows/release.yml

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -240,15 +240,13 @@ jobs:
240240
- name: Create or update release branch
241241
if: steps.calc_version.outputs.bump_type != ''
242242
run: |
243-
NEXT_VERSION="${{ steps.calc_version.outputs.next_version }}"
244-
BRANCH_NAME="release/v$NEXT_VERSION"
243+
BRANCH_NAME="release/edge"
245244
246245
echo "::group::Setting up release branch: $BRANCH_NAME"
247246
248-
git push origin --delete "$BRANCH_NAME" 2>/dev/null || true
249-
git branch -D "$BRANCH_NAME" 2>/dev/null || true
250-
251-
git checkout -b "$BRANCH_NAME"
247+
# Checkout release branch, reset to master
248+
git fetch origin "$BRANCH_NAME" 2>/dev/null || true
249+
git checkout -B "$BRANCH_NAME" origin/master
252250
253251
echo "::endgroup::"
254252
@@ -275,14 +273,14 @@ jobs:
275273
if: steps.calc_version.outputs.bump_type != ''
276274
run: |
277275
NEXT_VERSION="${{ steps.calc_version.outputs.next_version }}"
278-
BRANCH_NAME="release/v$NEXT_VERSION"
276+
BRANCH_NAME="release/edge"
279277
280278
echo "::group::Committing changes"
281279
282280
git add package.json package-lock.json CHANGELOG.md
283281
git commit -m "chore: release v$NEXT_VERSION"
284282
285-
git push origin "$BRANCH_NAME"
283+
git push -f origin "$BRANCH_NAME"
286284
287285
echo "::notice::Pushed release branch $BRANCH_NAME"
288286
echo "::endgroup::"
@@ -293,7 +291,7 @@ jobs:
293291
GH_TOKEN: ${{ secrets.BOT_TOKEN }}
294292
run: |
295293
NEXT_VERSION="${{ steps.calc_version.outputs.next_version }}"
296-
BRANCH_NAME="release/v$NEXT_VERSION"
294+
BRANCH_NAME="release/edge"
297295
BUMP_TYPE="${{ steps.calc_version.outputs.bump_type }}"
298296
299297
echo "::group::Creating/updating PR"

0 commit comments

Comments
 (0)