From 70dd9f3d884b9d3d2965ae65d7b37ea6e87dbe70 Mon Sep 17 00:00:00 2001
From: Jack McCluskey <thejackmccluskey@gmail.com>
Date: Wed, 5 Feb 2025 11:20:19 -0500
Subject: [PATCH 1/4] Fix cut_release_branch workflow

---
 .github/workflows/cut_release_branch.yml | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/cut_release_branch.yml b/.github/workflows/cut_release_branch.yml
index 3fe8e37d8b7c..e6120224749c 100644
--- a/.github/workflows/cut_release_branch.yml
+++ b/.github/workflows/cut_release_branch.yml
@@ -53,11 +53,11 @@ jobs:
     steps:
       - name: Validate Release Version
         run: |
-          if [[ ${RELEASE} =~ ([0-9]+\.[0-9]+\.[0-9]+) ]]; then
+          if [[ ${RELEASE} =~ ([0-9]+\.[0-9]+) ]]; then
             echo "RELEASE_VERSION=${BASH_REMATCH[1]}" >> $GITHUB_ENV
             echo "RELEASE_BRANCH=release-${RELEASE}" >> $GITHUB_ENV
           else
-            echo "The input for RELEASE does not match a valid format [0-9]+\.[0-9]+\.[0-9]+"
+            echo "The input for RELEASE does not match a valid format [0-9]+\.[0-9]+"
             exit 1
           fi
       - name: Check out code
@@ -97,10 +97,10 @@ jobs:
     steps:
       - name: Validate Next Version
         run: |
-          if [[ $NEXT_RELEASE =~ ([0-9]+\.[0-9]+\.[0-9]+) ]]; then
+          if [[ $NEXT_RELEASE =~ ([0-9]+\.[0-9]+) ]]; then
             echo "NEXT_VERSION_IN_BASE_BRANCH=${BASH_REMATCH[1]}" >> $GITHUB_ENV
           else
-            echo "The input for NEXT_RELEASE does not match a valid format [0-9]+\.[0-9]+\.[0-9]+"
+            echo "The input for NEXT_RELEASE does not match a valid format [0-9]+\.[0-9]+"
             exit 1
           fi
       - name: Check out code
@@ -116,7 +116,7 @@ jobs:
           sed -i -e "s/master: {}/master: {}\n    release-${RELEASE}: {}/g" .asf.yaml
       - name: Update master branch
         run: |
-          bash "${SCRIPT_DIR}/set_version.sh" "${NEXT_VERSION_IN_BASE_BRANCH}"
+          bash "${SCRIPT_DIR}/set_version.sh" "${NEXT_VERSION_IN_BASE_BRANCH}.0"
           echo "==============Update master branch as following================"
           git diff
           echo "==============================================================="

From 7db0a84048913f928990738a42c4bc46417330d2 Mon Sep 17 00:00:00 2001
From: Jack McCluskey <thejackmccluskey@gmail.com>
Date: Wed, 5 Feb 2025 11:23:55 -0500
Subject: [PATCH 2/4] avoid overcomplicating next release version

---
 .github/workflows/cut_release_branch.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/cut_release_branch.yml b/.github/workflows/cut_release_branch.yml
index e6120224749c..4581262b0280 100644
--- a/.github/workflows/cut_release_branch.yml
+++ b/.github/workflows/cut_release_branch.yml
@@ -35,7 +35,7 @@ on:
       NEXT_VERSION:
         description: Next release version
         required: true
-        default: '2.XX'
+        default: '2.XX.0'
       CREATE_RELEASE_BRANCH:
         description: Whether to cut the release branch. You shouldnt skip this unless it has already been completed successfully (yes/no)
         required: true
@@ -97,7 +97,7 @@ jobs:
     steps:
       - name: Validate Next Version
         run: |
-          if [[ $NEXT_RELEASE =~ ([0-9]+\.[0-9]+) ]]; then
+          if [[ $NEXT_RELEASE =~ ([0-9]+\.[0-9]+\.[0-9+]) ]]; then
             echo "NEXT_VERSION_IN_BASE_BRANCH=${BASH_REMATCH[1]}" >> $GITHUB_ENV
           else
             echo "The input for NEXT_RELEASE does not match a valid format [0-9]+\.[0-9]+"
@@ -116,7 +116,7 @@ jobs:
           sed -i -e "s/master: {}/master: {}\n    release-${RELEASE}: {}/g" .asf.yaml
       - name: Update master branch
         run: |
-          bash "${SCRIPT_DIR}/set_version.sh" "${NEXT_VERSION_IN_BASE_BRANCH}.0"
+          bash "${SCRIPT_DIR}/set_version.sh" "${NEXT_VERSION_IN_BASE_BRANCH}"
           echo "==============Update master branch as following================"
           git diff
           echo "==============================================================="

From f9fb462bcaea6504e8cc35c291273cba10bbe9eb Mon Sep 17 00:00:00 2001
From: Jack McCluskey <thejackmccluskey@gmail.com>
Date: Wed, 5 Feb 2025 11:26:18 -0500
Subject: [PATCH 3/4] fix nesting

---
 .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 4581262b0280..38b16da99a36 100644
--- a/.github/workflows/cut_release_branch.yml
+++ b/.github/workflows/cut_release_branch.yml
@@ -97,7 +97,7 @@ jobs:
     steps:
       - name: Validate Next Version
         run: |
-          if [[ $NEXT_RELEASE =~ ([0-9]+\.[0-9]+\.[0-9+]) ]]; then
+          if [[ $NEXT_RELEASE =~ ([0-9]+\.[0-9]+\.[0-9]+) ]]; then
             echo "NEXT_VERSION_IN_BASE_BRANCH=${BASH_REMATCH[1]}" >> $GITHUB_ENV
           else
             echo "The input for NEXT_RELEASE does not match a valid format [0-9]+\.[0-9]+"

From 28f639a887b8bee4bf5994f4363df66704e59300 Mon Sep 17 00:00:00 2001
From: Jack McCluskey <thejackmccluskey@gmail.com>
Date: Wed, 5 Feb 2025 11:31:02 -0500
Subject: [PATCH 4/4] fix error message

---
 .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 38b16da99a36..f6b32cbe5291 100644
--- a/.github/workflows/cut_release_branch.yml
+++ b/.github/workflows/cut_release_branch.yml
@@ -100,7 +100,7 @@ jobs:
           if [[ $NEXT_RELEASE =~ ([0-9]+\.[0-9]+\.[0-9]+) ]]; then
             echo "NEXT_VERSION_IN_BASE_BRANCH=${BASH_REMATCH[1]}" >> $GITHUB_ENV
           else
-            echo "The input for NEXT_RELEASE does not match a valid format [0-9]+\.[0-9]+"
+            echo "The input for NEXT_RELEASE does not match a valid format [0-9]+\.[0-9]+\.[0-9]+"
             exit 1
           fi
       - name: Check out code