Skip to content

Commit b5a8386

Browse files
authored
Remove automatic Z stream version bumping in release branch (#1584)
Signed-off-by: David Kwon <dakwon@redhat.com>
1 parent 2b5bbff commit b5a8386

File tree

1 file changed

+1
-16
lines changed

1 file changed

+1
-16
lines changed

make-release.sh

Lines changed: 1 addition & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -38,9 +38,7 @@ files within that branch to reflect the new version. This branch should then be
3838
tested, with additional commits cherry-picked as necessary to prepare for
3939
release. Once the HEAD commit of the '0.<VERSION>.x' branch is ready for
4040
release, use the '--release' from the release branch to create the release tag
41-
and build and push release container images to the Quay repo. Running with the
42-
release flag will also update versions in the release branch to reflect the next
43-
bugfix release (e.g. will update from v0.8.0 to v0.8.1).
41+
and build and push release container images to the Quay repo.
4442
4543
To issue a bugfix release, cherry-pick commits into the existing release branch
4644
as necessary and run this script with the '--release' flag for the given bugfix
@@ -325,19 +323,6 @@ release() {
325323
# Commit changes from rendering digests bundle
326324
git_commit_and_push "[post-release] Add OLM digest bundle for $VERSION in $X_BRANCH" "ci-add-digest-bundle-$VERSION"
327325

328-
# Update ${X_BRANCH} to the new rc version
329-
git checkout "${X_BRANCH}"
330-
331-
# bump the z digit
332-
[[ ${VERSION#v} =~ ^([0-9]+)\.([0-9]+)\.([0-9]+) ]] \
333-
&& BASE="${BASH_REMATCH[1]}.${BASH_REMATCH[2]}"; \
334-
NEXT="${BASH_REMATCH[3]}"; (( NEXT=NEXT+1 )) # for VERSION=0.1.2, get BASE=0.1, NEXT=3
335-
NEXT_VERSION_Z="v${BASE}.${NEXT}"
336-
337-
update_version "$NEXT_VERSION_Z"
338-
update_images "$NEXT_VERSION_Z"
339-
git_commit_and_push "chore: release: bump to ${NEXT_VERSION_Z} in $X_BRANCH" "ci-bump-$X_BRANCH-$NEXT_VERSION_Z"
340-
341326
echo "[INFO] Release is done"
342327
}
343328

0 commit comments

Comments
 (0)