Skip to content

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

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

Merged
merged 1 commit into from
Jun 24, 2025

Conversation

sourcegraph-release-bot
Copy link
Contributor

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

…ug (#286)

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

(cherry picked from commit 61f4376)
@DaedalusG DaedalusG merged commit 6b182e1 into 6.5.x Jun 24, 2025
8 checks passed
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