release: Switch branch to stable branch from script

[ivanvc]

Follow up from #903 (comment)

Switch branches to avoid backporting and maintaining the release script in each of the stable release branches.

/cc @ahrtr @Elbehery

[Elbehery]

@ivanvc nice work 👍🏽

Could we test it, and paste the test output here 🤔

[ahrtr]

I think we also need to check whether the working directory is clean, error out if not.

[ahrtr]

suggest to keep it as simple as possible

Suggested change

	# Checkout release branch and ensure to return to the current reference after
	# the release finishes.
	PREVIOUS_REF=$(git rev-parse HEAD)
	if git symbolic-ref HEAD &>/dev/null; then
	PREVIOUS_REF=$(git symbolic-ref HEAD | rev | cut -d/ -f1 | rev)
	fi

[ahrtr]

ditto

Suggested change

	# shellcheck disable=SC2064 # Intentionally expanding PREVIOUS_REF now.
	trap "git checkout ${PREVIOUS_REF}" EXIT

[ahrtr]

Based on the current implementation, you can release bbolt on any forked repo. Suggest to follow the same approach as etcd.

• fork the main repo git@github.com:etcd-io/bbolt.git
• cd ${reldir}/etcd
• git checkout ${TARGET_BRANCH}
• ......

https://github.com/etcd-io/etcd/blob/8142396ae8501d0f7ca896f3eb91ae99b54ca9b7/scripts/release.sh#L91-L100

[ahrtr]

Another related comment on checking whether tag exists or not (see below), I think it should be a little better to follow the same approach/command as etcd to ensure exact match. Otherwise it will run into the corner case when releasing the very first minor version. For example, when releasing v1.5.0, the v1.5.0-alpha.0 might have already exist, then current script will think the tag v1.5.0 already exist

bbolt/scripts/release.sh

Lines 36 to 40 in a129a9e

	remote_tag_exists=$(git ls-remote --tags "${REPOSITORY}" | grep -c "${INPUT}" || true)
	if [ "${remote_tag_exists}" -gt 0 ]; then
	echo "Release version tag exists on remote."
	exit 1
	fi

etcd:
https://github.com/etcd-io/etcd/blob/8142396ae8501d0f7ca896f3eb91ae99b54ca9b7/scripts/release.sh#L108

[ivanvc]

I applied the suggestions. Therefore, this pull request grew in size, as it needed some refactoring.

I verified running the script by pointing to my fork. i.e.,

REPOSITORY=git@github.com:ivanvc/bbolt.git ./scripts/release.sh v1.4.3

• It created the tag: https://github.com/ivanvc/bbolt/releases/tag/v1.4.3
• It pushed the commit: https://github.com/ivanvc/bbolt/tree/release-1.4 / ivanvc@496bbdb

Note that this is a fictional 1.4.3 version, that branch is not up to date with the upstream.

[ahrtr]

LGTM & thx

[k8s-ci-robot]

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: ahrtr, ivanvc

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:

• OWNERS [ahrtr]

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment