From d8dfd181f6340ad5e74fcefb6e4eaa532a3b3227 Mon Sep 17 00:00:00 2001
From: Wesley Maxey <wesley.maxey@gmail.com>
Date: Fri, 1 Nov 2024 22:50:35 +0000
Subject: [PATCH] Fixups

---
 .github/workflows/release-create-new.yml    |  7 +++----
 .github/workflows/update-branch-version.yml | 19 +------------------
 2 files changed, 4 insertions(+), 22 deletions(-)

diff --git a/.github/workflows/release-create-new.yml b/.github/workflows/release-create-new.yml
index c1bf600a66d..e580a4d3718 100644
--- a/.github/workflows/release-create-new.yml
+++ b/.github/workflows/release-create-new.yml
@@ -106,10 +106,9 @@ jobs:
           git show --oneline --no-patch HEAD | tee -a $GITHUB_STEP_SUMMARY
 
       - name: Update version numbers in main
-        uses: ./.github/workflows/update-branch-version.yml
-        with:
-          new_version: "${{ inputs.main_version }}"
-          target_branch: "main"
+        id: update_main
+        run: |
+          gh workflow run update-branch-version.yml --ref main -f new_version="$main_version" -f target_branch="main" | tee -a $GITHUB_STEP_SUMMARY
 
       - name: Notify Slack
         if: ${{ success()}}
diff --git a/.github/workflows/update-branch-version.yml b/.github/workflows/update-branch-version.yml
index 574f3548b8e..7655cae528c 100644
--- a/.github/workflows/update-branch-version.yml
+++ b/.github/workflows/update-branch-version.yml
@@ -14,6 +14,7 @@
 # limitations under the License.
 
 name: "Release: 0. Update version in target branch"
+id: "update_branch_version"
 
 # The target branch when starting this workflow should be:
 # 1. "branch/{major}.{minor}.x" if it exists, or
@@ -38,24 +39,6 @@ on:
         required: true
         default: false
 
-  workflow_call:
-    inputs:
-      new_version:
-        description: "Version 'X.Y.Z' for the release branch."
-        type: string
-        required: true
-        default: "0.0.0"
-      target_branch:
-        description: "Target branch for the version update"
-        type: string
-        required: false
-        default: "main"
-      force:
-        description: "Enable overwriting existing PR branches (this does not force overwrite the target branch or skip creating a PR)"
-        type: boolean
-        required: true
-        default: false
-
 defaults:
   run:
     shell: bash --noprofile --norc -euo pipefail {0}