Skip to content

Commit 228c3d7

Browse files
[Backport 6.5.x] Fix(release): promoteToPublic.finalize github:pr update main target bug (#1231)
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 &#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 d7ddf22 from #1227 Co-authored-by: Warren Gifford <[email protected]>
1 parent f9c837f commit 228c3d7

File tree

1 file changed

+2
-4
lines changed

1 file changed

+2
-4
lines changed

release.yaml

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -278,13 +278,11 @@ promoteToPublic:
278278
- name: "github:pr"
279279
cmd: |
280280
set -eu
281-
internal_branch="promote/release-{{version}}-update-main"
282-
# we need to fetch from origin just in case this branch doesn't exist locally, so that the PR can find the base
283-
git fetch origin "${internal_branch}"
281+
# Create PR to merge release updates into main branch
284282
gh pr create \
285283
--fill \
286284
--draft \
287-
--base "$internal_branch" \
285+
--base main \
288286
--title "Update main: build {{version}}" \
289287
--body "Test plan: automated release PR, CI will perform additional checks"
290288
echo "🚢 Please check the associated CI build to ensure the process completed".

0 commit comments

Comments
 (0)