Skip to content

Commit

Permalink
release: allow 3.6 releases
Browse files Browse the repository at this point in the history
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 <[email protected]>
  • Loading branch information
ivanvc committed Dec 4, 2024
1 parent 16cf5b6 commit c85f070
Showing 1 changed file with 8 additions and 1 deletion.
9 changes: 8 additions & 1 deletion scripts/release.sh
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,14 @@ main() {
BRANCH=$(git rev-parse --abbrev-ref HEAD)
else
REPOSITORY=${REPOSITORY:-"[email protected]: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}"
Expand Down

0 comments on commit c85f070

Please sign in to comment.