Skip to content

Conversation

@DaedalusG
Copy link
Contributor

@DaedalusG DaedalusG commented Jun 23, 2025

Closes REL-1069

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

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.
@DaedalusG DaedalusG changed the title Fix release pipeline: promoteToPublic.finalize github:pr step creating PR to wrong branch Fix(release): promoteToPublic.finalize github:pr update main target bug Jun 23, 2025
@DaedalusG DaedalusG requested a review from a team June 23, 2025 21:38
@DaedalusG DaedalusG marked this pull request as ready for review June 23, 2025 21:38
@DaedalusG DaedalusG enabled auto-merge (squash) June 24, 2025 16:44
@DaedalusG DaedalusG merged commit 61f4376 into main Jun 24, 2025
6 checks passed
DaedalusG added a commit that referenced this pull request Jun 24, 2025
…ate main target bug (#287)

Closes REL-1069

## 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 <br> Backport
61f4376 from #286

Co-authored-by: Warren Gifford <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants