From c85f07027f25f56c993567465f65fe6cef514bbf Mon Sep 17 00:00:00 2001 From: Ivan Valdes Date: Wed, 4 Dec 2024 12:12:46 -0800 Subject: [PATCH] release: allow 3.6 releases Currently, the release script assumes that there's a branch named `release-{minor}`, which is not the case for prereleases (v3.6), that should use the main branch. Signed-off-by: Ivan Valdes --- scripts/release.sh | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/scripts/release.sh b/scripts/release.sh index d3ec4c1e765..a06ca426642 100755 --- a/scripts/release.sh +++ b/scripts/release.sh @@ -62,7 +62,14 @@ main() { BRANCH=$(git rev-parse --abbrev-ref HEAD) else REPOSITORY=${REPOSITORY:-"git@github.com:etcd-io/etcd.git"} - BRANCH=${BRANCH:-"release-${MINOR_VERSION}"} + if [ "${MINOR_VERSION}" == "3.6" ]; then + BRANCH=main + log_warning "" + log_warning "Building a v${MINOR_VERSION} pre-release based on the main branch." + log_warning "" + else + BRANCH=${BRANCH:-"release-${MINOR_VERSION}"} + fi fi log_warning "DRY_RUN=${DRY_RUN}"