From 6e5a60ec529a4ec1ad2c8156dfa5d973f983da20 Mon Sep 17 00:00:00 2001
From: Ivan Valdes <ivan@vald.es>
Date: Fri, 13 Sep 2024 15:02:47 -0700
Subject: [PATCH] release: push tag after creating it

Signed-off-by: Ivan Valdes <ivan@vald.es>
---
 scripts/release.sh | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/scripts/release.sh b/scripts/release.sh
index 6ca51114f5b..603c628b696 100755
--- a/scripts/release.sh
+++ b/scripts/release.sh
@@ -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
@@ -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
@@ -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
@@ -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.