Skip to content

Commit 5fe1a9b

Browse files
committed
Update mergeback workflow
1 parent ba674fb commit 5fe1a9b

1 file changed

Lines changed: 7 additions & 7 deletions

File tree

.github/workflows/post-release-mergeback.yml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
1-
# This workflow runs after a release of the action. For v2 releases, it merges any changes from the
2-
# release back into the main branch. Typically, this is just a single commit that updates the
3-
# changelog. For v2 and v1 releases, it then (a) tags the merge commit on the release branch that
4-
# represents the new release with an `vx.y.z` tag and (b) updates the `vx` tag to refer to this
5-
# commit.
1+
# This workflow runs after a release of the action. It:
2+
# 1. Merges any changes from the release back into the main branch. Typically, this is just a single
3+
# commit that updates the changelog.
4+
# 2. Tags the merge commit on the release branch that represents the new release with an `v2.x.y`
5+
# tag
6+
# 3. Updates the `v2` tag to refer to this merge commit.
67
name: Tag release and merge back
78

89
on:
@@ -15,7 +16,6 @@ on:
1516

1617
push:
1718
branches:
18-
- releases/v1
1919
- releases/v2
2020

2121
jobs:
@@ -105,7 +105,7 @@ jobs:
105105
git push origin --atomic --force refs/tags/"${VERSION}" refs/tags/"${major_version_tag}"
106106
107107
- name: Create mergeback branch
108-
if: steps.check.outputs.exists != 'true' && contains(github.ref, 'releases/v2')
108+
if: steps.check.outputs.exists != 'true'
109109
env:
110110
VERSION: "${{ steps.getVersion.outputs.version }}"
111111
NEW_BRANCH: "${{ steps.getVersion.outputs.newBranch }}"

0 commit comments

Comments
 (0)