Skip to content

workflows: default to trunk merge for backport auto-merge #167546

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.

Sign up for GitHub

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
trunk-io merged 1 commit into from
Apr 6, 2026
Merged

workflows: default to trunk merge for backport auto-merge #167546

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions .github/workflows/auto-merge-backports.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,8 +83,9 @@ jobs:
const baseRef = pr.baseRefName;
console.log(`Processing PR #${pr.number}, Created at: ${pr.createdAt}, Approved: ${approved}, Target: ${baseRef}, Labels: ${labels}`);

const trunkBranches = ['release-24.3', 'release-25.2'];
if (trunkBranches.includes(baseRef)) {
const nonTrunkBranches = ['release-24.1', 'release-25.1', 'release-25.3'];
const useTrunk = !nonTrunkBranches.includes(baseRef);
if (useTrunk) {
// Use comment to trigger trunk merge for trunk-enabled branches
console.log(`Adding /trunk merge comment for PR #${pr.number} (target: ${baseRef})`);
try {
Expand Down
Loading