From 6e75f27751a8522312aa0278c7f3e291536985e4 Mon Sep 17 00:00:00 2001
From: Warren Gifford <warrenbruceg@gmail.com>
Date: Mon, 23 Jun 2025 14:21:29 -0700
Subject: [PATCH] Fix promoteToPublic.finalize github:pr step

The final github:pr step in the promoteToPublic.finalize workflow was
incorrectly trying to create a PR from the current branch to itself,
causing 'must be on a branch named differently' errors.

Root cause: Variable internal_branch was set to the current branch name
'promote/release-{{version}}-update-main' instead of the target branch 'main'.

This step is intended to create a PR to merge the updated release images
into the main branch, so the --base should be 'main', not the current branch.

Fixes the systematic release pipeline failures in promote branches.
---
 release.yaml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/release.yaml b/release.yaml
index 6e139e53..451bcbad 100644
--- a/release.yaml
+++ b/release.yaml
@@ -618,11 +618,11 @@ promoteToPublic:
       - name: "github:pr"
         cmd: |
           set -eu
-          internal_branch="promote/release-{{version}}-update-main"
+          # Create PR to merge release updates into main branch
           gh pr create \
             --fill \
             --draft \
-            --base "$internal_branch" \
+            --base main \
             --title "Update main: build {{version}}" \
             --body "Test plan: automated release PR, CI will perform additional checks"
           echo "🚢 Please check the associated CI build to ensure the process completed".