Skip to content

Commit dc638d7

Browse files
[Backport 6.5.x] Fix(release): promoteToPublic.finalize github:pr update main target bug (#702)
Closes REL-1068 ## 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 &#39;promote/release-v6.4.3889-update-main&#39; ``` ## 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 <br> Backport 1c06d26 from #699 Co-authored-by: Warren Gifford <[email protected]>
1 parent 05b8f2c commit dc638d7

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

release.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -618,11 +618,11 @@ promoteToPublic:
618618
- name: "github:pr"
619619
cmd: |
620620
set -eu
621-
internal_branch="promote/release-{{version}}-update-main"
621+
# Create PR to merge release updates into main branch
622622
gh pr create \
623623
--fill \
624624
--draft \
625-
--base "$internal_branch" \
625+
--base main \
626626
--title "Update main: build {{version}}" \
627627
--body "Test plan: automated release PR, CI will perform additional checks"
628628
echo "🚢 Please check the associated CI build to ensure the process completed".

0 commit comments

Comments
 (0)