workflows: add trunk auto-merge support for release-25.4 backport PRs#162003
Merged
craig[bot] merged 1 commit intocockroachdb:masterfrom Jan 29, 2026
Merged
workflows: add trunk auto-merge support for release-25.4 backport PRs#162003craig[bot] merged 1 commit intocockroachdb:masterfrom
craig[bot] merged 1 commit intocockroachdb:masterfrom
Conversation
Previously, the auto-merge workflow merged all qualifying backport PRs directly using the GitHub merge API, regardless of their target branch. This was inadequate because the release-25.4 branch requires the trunk merge process (triggered via /trunk merge comment) instead of direct merging, while other release branches still need direct merging. To address this, this patch adds baseRefName to the GraphQL query to identify each PR's target branch, and implements conditional logic that adds a /trunk merge comment for PRs targeting release-25.4 while continuing to directly merge PRs targeting all other branches. The logging was also enhanced to include the target branch for better visibility. Release notes: None Epic: CODESYS-206
Member
|
This change is |
rail
approved these changes
Jan 29, 2026
Contributor
Author
|
bors r+ |
Contributor
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 merged all qualifying backport PRs directly using the GitHub merge API, regardless of their target branch.
This was inadequate because the release-25.4 branch requires the trunk merge process (triggered via /trunk merge comment) instead of direct merging, while other release branches still need direct merging.
To address this, this patch adds baseRefName to the GraphQL query to identify each PR's target branch, and implements conditional logic that adds a /trunk merge comment for PRs targeting release-25.4 while continuing to directly merge PRs targeting all other branches. The logging was also enhanced to include the target branch for better visibility.
Testing
auto-merge-backport.ymlwhere it only logs and adds the/trunk mergecommentRelease notes: None
Epic: CODESYS-206