Skip to content

Commit 3a9836c

Browse files
committed
chore: Release workflow now resets stable branch if diverged
1 parent 94a0b18 commit 3a9836c

File tree

1 file changed

+2
-4
lines changed

1 file changed

+2
-4
lines changed

.github/workflows/release.yaml

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -57,10 +57,8 @@ jobs:
5757
git config user.email 'github-actions[bot]@users.noreply.github.com'
5858
- name: Update stable branch
5959
run: |
60-
git checkout stable
61-
git pull
62-
git merge --no-ff main -m "Publish to stable"
63-
git push
60+
git checkout -B stable main
61+
git push -f origin stable
6462
- name: Run publish (stable)
6563
env:
6664
CONTENT_BUCKET: "${{ secrets.CONTENT_BUCKET }}"

0 commit comments

Comments
 (0)