workflows: default to trunk merge for backport auto-merge#167546
Merged
trunk-io[bot] merged 1 commit intoApr 6, 2026
Conversation
Contributor
|
😎 Merged directly without going through the merge queue, as the queue was empty and the PR was up to date with the target branch - details. |
Member
|
This change is |
Previously, the auto-merge workflow maintained an allowlist of trunk-enabled branches, which required updating every time a new release branch was cut. This caused auto-merge failures on newer branches like release-25.4, release-26.1, and release-26.2 because the GITHUB_TOKEN lacks permission to push directly to protected branches. Invert the logic to use a blocklist of known non-trunk branches instead, so new release branches default to using `/trunk merge`. Epic: none Release note: None Co-Authored-By: roachdev-claude <roachdev-claude-bot@cockroachlabs.com>
rafiss
force-pushed
the
auto-merge-trunk-branches
branch
from
6925740 to
899d1e6
Compare
rafiss
changed the title
Collaborator
Author
rudrakshsisodia
approved these changes
Apr 6, 2026
Contributor
|
LGTM! |
Collaborator
Author
|
TFTR! /trunk merge |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Previously, the auto-merge workflow maintained an allowlist of
trunk-enabled branches, which required updating every time a new
release branch was cut. This caused auto-merge failures on newer
branches like release-25.4, release-26.1, and release-26.2 because
the
GITHUB_TOKENlacks permission to push directly to protectedbranches.
Invert the logic to use a blocklist of known non-trunk branches
instead, so new release branches default to using
/trunk merge.Epic: none
Release note: None