Skip to content

Conversation

DaedalusG
Copy link
Contributor

Test plan: automated release PR, CI will perform additional checks

sourcegraph-release-bot and others added 2 commits June 24, 2025 13:27
…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 <warrenbruceg@gmail.com>
{"version":"v6.5.2654","inputs":"server=v6.5.2654","type":"patch"}
@sourcegraph-buildkite
Copy link

  • 🟢 Internal release is ready for promotion!
  • ⚠️ Do not close/merge the pull request or delete the associated branch if you intend to promote it.

@sourcegraph-buildkite
Copy link

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants