Skip to content

Commit 7ea7f86

Browse files
committed
release: allow for branch protection in release steps
Since the introduction of the branch protection rule to stop users pushing directly to `main` the previous release steps started failing. This changes the instructions to require the user merges the changelog update before tagging the release. Signed-off-by: crozzy <joseph.crosland@gmail.com>
1 parent 22e7628 commit 7ea7f86

File tree

1 file changed

+3
-2
lines changed

1 file changed

+3
-2
lines changed

.github/scripts/prepare-release

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,10 +38,11 @@ gh run watch "${id}"
3838
cat <<.
3939
Now, to merge and release:
4040
41+
go to github and approve the PR titled "${VERSION} Changelog Bump" and wait for it to be merged.
4142
git checkout ${BRANCH}
4243
git fetch ${REMOTE}
43-
git merge --ff-only ${REMOTE}/ready-${VERSION}
44+
git merge --ff-only ${REMOTE}/${BRANCH}
4445
git tag -s ${VERSION}
45-
git push ${REMOTE} ${BRANCH} :ready-${VERSION} tag ${VERSION}
46+
git push :ready-${VERSION} tag ${VERSION}
4647
4748
.

0 commit comments

Comments
 (0)