Skip to content

[Backport 6.5.x] Fix(release): promoteToPublic.finalize github:pr update main target bug #1231

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: 6.5.x
Choose a base branch
from

Conversation

sourcegraph-release-bot
Copy link
Collaborator

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

Backport d7ddf22 from #1227

…ug (#1227)

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 d7ddf22)
@DaedalusG DaedalusG enabled auto-merge (squash) June 25, 2025 19:55
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.

2 participants