From 4d717e138f5c307e9ee8b5f0df8f2d4f60301186 Mon Sep 17 00:00:00 2001
From: Adrian Cole <adrian@tetrate.io>
Date: Thu, 7 Dec 2023 15:48:23 +0800
Subject: [PATCH] ci: reverts auto-selection of release branch

Currently, we can't release from master, so reverting the change done
for the now removed v3 branch.

Signed-off-by: Adrian Cole <adrian@tetrate.io>
---
 build-bin/maven/maven_release | 21 +++++++++++----------
 1 file changed, 11 insertions(+), 10 deletions(-)

diff --git a/build-bin/maven/maven_release b/build-bin/maven/maven_release
index 3df408180c6..0ef28e48117 100755
--- a/build-bin/maven/maven_release
+++ b/build-bin/maven/maven_release
@@ -25,18 +25,19 @@ export MAVEN_OPTS="$($(dirname "$0")/maven_opts)"
 
 trigger_tag=${1?trigger_tag is required. Ex release-1.2.3}
 release_version=$(build-bin/git/version_from_trigger_tag release- ${trigger_tag})
+release_branch=${2:-master}
 
-# Checkout the branch that triggered this build
-git fetch --tags origin
-commit_sha=$(git rev-parse "$trigger_tag")
-branches=$(git branch --contains "$commit_sha")
-branch_name=$(echo "$branches" | head -n 1 | awk '{print $2}')
-if [ -z "$branch_name" ]; then
-  default_branch="master"
-  echo "Unable to determine a valid branch. Auto-selecting the default branch: $default_branch"
-  branch_name=$default_branch
+# Checkout master, as we release from master, not a tag ref
+git fetch --no-tags --prune --depth=1 origin +refs/heads/${release_branch}:refs/remotes/origin/${release_branch}
+git checkout ${release_branch}
+
+# Ensure no one pushed commits since this release tag as it would fail later commands
+commit_local_release_branch=$(git show --pretty='format:%H' ${release_branch})
+commit_remote_release_branch=$(git show --pretty='format:%H' origin/${release_branch})
+if [ "$commit_local_release_branch" != "$commit_remote_release_branch" ]; then
+  >&2 echo "${release_branch} on remote 'origin' has commits since the version to release, aborting"
+  exit 1
 fi
-git checkout "$branch_name"
 
 # Prepare and push release commits and the version tag (N.N.N), which triggers deployment.
 ./mvnw --batch-mode -nsu -DreleaseVersion=${release_version} -Denforcer.fail=false -Darguments="-DskipTests -Denforcer.fail=false" release:prepare