From 703349ec08496a83d51fbc4f802d53f236d16c70 Mon Sep 17 00:00:00 2001
From: Danny McCormick <dannymccormick@google.com>
Date: Wed, 5 Feb 2025 12:07:56 -0500
Subject: [PATCH 1/2] Update release branch cut to still update container
 version to 2.XX.0

---
 .github/workflows/cut_release_branch.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/cut_release_branch.yml b/.github/workflows/cut_release_branch.yml
index f6b32cbe529..a0fcd911db6 100644
--- a/.github/workflows/cut_release_branch.yml
+++ b/.github/workflows/cut_release_branch.yml
@@ -74,7 +74,7 @@ jobs:
           echo "==============================================================="
       - name: Update release version for dataflow runner
         run: |
-          sed -i -e "s/'beam-master-.*'/'${RELEASE}'/g" \
+          sed -i -e "s/'beam-master-.*'/'${RELEASE}.0'/g" \
           runners/google-cloud-dataflow-java/build.gradle
           echo "===============Update release branch as following=============="
           git diff

From 07d0da1f51baf58a70a084c085475ff5a06dc69b Mon Sep 17 00:00:00 2001
From: Danny Mccormick <dannymccormick@google.com>
Date: Wed, 5 Feb 2025 12:26:29 -0500
Subject: [PATCH 2/2] Update a few more spots

---
 release/src/main/scripts/set_version.sh          | 5 +++++
 release/src/main/scripts/verify_release_build.sh | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/release/src/main/scripts/set_version.sh b/release/src/main/scripts/set_version.sh
index ec29ebe9c47..c316fbb61d9 100755
--- a/release/src/main/scripts/set_version.sh
+++ b/release/src/main/scripts/set_version.sh
@@ -69,6 +69,11 @@ if [[ -z $TARGET_VERSION ]] ; then
   exit 1
 fi
 
+if ! [[ ${RELEASE} =~ ([0-9]+\.[0-9]+\.[0-9]+) ]];
+  then  echo "The input for RELEASE does not match a valid format [0-9]+\.[0-9]+\.[0-9]+"
+  exit 1
+fi
+
 if [[ -z "$IS_SNAPSHOT_VERSION" ]] ; then
   # Fixing a release version
   sed -i -e "s/version=.*/version=$TARGET_VERSION/" gradle.properties
diff --git a/release/src/main/scripts/verify_release_build.sh b/release/src/main/scripts/verify_release_build.sh
index d304456ecb4..124c806a321 100755
--- a/release/src/main/scripts/verify_release_build.sh
+++ b/release/src/main/scripts/verify_release_build.sh
@@ -36,7 +36,7 @@
 set -e
 
 BEAM_REPO_URL=https://github.com/apache/beam.git
-RELEASE_BRANCH=release-${RELEASE_VER}
+RELEASE_BRANCH="release-$(cut -d '.' -f 1,2 <<< $RELEASE)"
 WORKING_BRANCH=postcommit_validation_pr
 SCRIPT=$(readlink -f $0)
 SCRIPT_DIR=$(dirname $SCRIPT)