Skip to content

Commit 34dd6c9

Browse files
committed
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.
1 parent 9a94098 commit 34dd6c9

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)