[3.4] Backport cherry-pick of etcd-io#14860: Trigger release in curre…

…nt branch for github workflow case

Signed-off-by: ArkaSaha30 <[email protected]>

scripts/build-binary.sh

@@ -5,8 +5,7 @@ set -e
 source ./scripts/test_lib.sh
 
 VER=$1
-PROJ="etcd"
-REPOSITORY="${REPOSITORY:-https://github.com/etcd-io/etcd.git}"
+REPOSITORY="${REPOSITORY:-git@github.com:etcd-io/etcd.git}"
 
 if [ -z "$1" ]; then
 	echo "Usage: ${0} VERSION" >> /dev/stderr
@@ -16,18 +15,17 @@ fi
 set -u
 
 function setup_env {
-	local proj=${1}
-	local ver=${2}
+  local ver=${1}
+  local proj=${2}
 
-	if [ ! -d "${proj}" ]; then
-	  log_callout "Cloning ${REPOSITORY}..."
-	  git clone "${REPOSITORY}"
-	fi
+  if [ ! -d "${proj}" ]; then
+    run git clone "${REPOSITORY}"
+  fi
 
-	pushd "${proj}" >/dev/null
-		git fetch --all
-		git checkout "${ver}"
-	popd >/dev/null
+  pushd "${proj}" >/dev/null
+    run git fetch --all
+    run git checkout "${ver}"
+  popd >/dev/null
 }
 
 

scripts/release.sh

@@ -149,14 +149,6 @@ main() {
       git tag --local-user "${KEYID}" --sign "${RELEASE_VERSION}" --message "${RELEASE_VERSION}"
     fi
 
-    # Verify the latest commit has the version tag
-    # shellcheck disable=SC2155
-    local tag="$(git describe --exact-match HEAD)"
-    if [ "${tag}" != "${RELEASE_VERSION}" ]; then
-      log_error "Error: Expected HEAD to be tagged with ${RELEASE_VERSION}, but 'git describe --exact-match HEAD' reported: ${tag}"
-      exit 1
-    fi
-
     if [ "${IN_PLACE}" == 0 ]; then
       # Tried with `local branch=$(git branch -a --contains tags/"${RELEASE_VERSION}")`
       # so as to work with both current branch and main/release-3.X.