Skip to content

ci: trunk guard — only trunk may merge into main #1933

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

Closed
khaliqgant wants to merge 2 commits into from
Closed

ci: trunk guard — only trunk may merge into main #1933

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6651d1c
ci: trunk guard — only trunk may merge into main
khaliqgant Oct 8, 2026
a6d6fc8
fix(ci): reject fork branches named trunk in the guard
khaliqgant Oct 8, 2026
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
23 changes: 23 additions & 0 deletions .github/workflows/trunk-guard.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
name: Trunk guard

# Only the `trunk` branch of THIS repository may merge into main. Feature
# branches merge into `trunk`; CI runs only on the trunk -> main PR.
#
# The head-repo check is load-bearing: `github.head_ref` is just the branch
# name, so a fork whose head branch is also called `trunk` would otherwise
# skip the guard and merge straight into main.
on:
pull_request:
branches: [main]

jobs:
only-trunk-merges-to-main:
if: >-
github.event.pull_request.head.repo.full_name != github.repository
|| github.head_ref != 'trunk'
runs-on: ubuntu-latest
timeout-minutes: 1
steps:
- run: |
echo "::error::Only the 'trunk' branch of ${{ github.repository }} may merge into main. Retarget this PR to 'trunk'."
exit 1
Loading