From c29dbd050d9af35a4d210bc136cd7173679f93cd Mon Sep 17 00:00:00 2001
From: Warren Gifford <warrenbruceg@gmail.com>
Date: Tue, 24 Jun 2025 09:43:29 -0700
Subject: [PATCH] Fix(release): promoteToPublic.finalize github:pr update main
 target bug (#1227)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Closes REL-1067

## Problem

The release pipeline has been systematically failing in the
`promoteToPublic.finalize` workflow with this error:
```
Warning: 1 uncommitted change
must be on a branch named differently than 'promote/release-v6.4.3889-update-main'
```

## Root Cause

The final `github:pr` step in the `promoteToPublic.finalize` workflow
was incorrectly trying to create a PR from the current branch to itself:

- **Current branch**: `promote/release-{{version}}-update-main`
- **Target branch**: `promote/release-{{version}}-update-main` ❌ (same
branch!)
- **Should target**: `main` ✅

This happened because the variable `internal_branch` was set to the
current branch name instead of the intended target branch.

### Test plan
This will have to be tested on a release

(cherry picked from commit d7ddf22bac158b14a5ee1a0e802f7a20c9efdbb7)
---
 release.yaml | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/release.yaml b/release.yaml
index 8076a0dd..2393e9fb 100644
--- a/release.yaml
+++ b/release.yaml
@@ -278,13 +278,11 @@ promoteToPublic:
       - name: "github:pr"
         cmd: |
           set -eu
-          internal_branch="promote/release-{{version}}-update-main"
-          # we need to fetch from origin just in case this branch doesn't exist locally, so that the PR can find the base
-          git fetch origin "${internal_branch}"
+          # 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".