Skip to content

Commit

Permalink
Merge pull request #18587 from ivanvc/release-3.4-release-push-tag
Browse files Browse the repository at this point in the history
[3.4] release: push tag after creating it
  • Loading branch information
ahrtr authored Sep 17, 2024
2 parents c123b3e + 6e5a60e commit b1bdb47
Showing 1 changed file with 8 additions and 3 deletions.
11 changes: 8 additions & 3 deletions scripts/release.sh
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ main() {
git checkout "${BRANCH}" || exit 2
git pull origin
fi

# If a release version tag already exists, use it.
log_callout "Checking tag: ${RELEASE_VERSION}"
local remote_tag_exists
Expand Down Expand Up @@ -125,7 +125,7 @@ main() {

# Push the version change if it's not already been pushed.
if [ "$DRY_RUN" != "true" ] && [ "$(git rev-list --count "origin/${BRANCH}..${BRANCH}")" -gt 0 ]; then
read -p "Push version bump up to ${VERSION} to github.com/etcd-io/etcd [y/N]? " -r confirm
read -p "Push version bump up to ${VERSION} to ${REPOSITORY} [y/N]? " -r confirm
[[ "${confirm,,}" == "y" ]] || exit 1
git push
fi
Expand All @@ -142,6 +142,12 @@ main() {
exit 1
fi
git tag --local-user "${KEYID}" --sign "${RELEASE_VERSION}" --message "${RELEASE_VERSION}"

if [ "$DRY_RUN" != "true" ]; then
read -p "Push tag ${RELEASE_VERSION} to ${REPOSITORY} [y/N]? " -r confirm
[[ "${confirm,,}" == "y" ]] || exit 1
git push origin "${RELEASE_VERSION}"
fi
fi

# Verify the latest commit has the version tag
Expand Down Expand Up @@ -185,7 +191,6 @@ main() {
log_error "Error: Expected clean working tree, but 'git diff --stat' reported: ${diff}"
exit 1
fi


# Build release.
# TODO: check the release directory for all required build artifacts.
Expand Down

0 comments on commit b1bdb47

Please sign in to comment.