Skip to content

ci: drop trunk gating and the merge-train snippet (back to per-PR CI) - #551

Merged
kjgbot merged 1 commit into
mainfrom
chore/revert-merge-train
Oct 9, 2026
Merged

kjgbot merged 1 commit into
mainfrom
chore/revert-merge-train

Conversation

@kjgbot

@kjgbot kjgbot commented Oct 9, 2026 •

Copy link
Copy Markdown
Contributor

Khaliq's decision: the merge train is now cloud-only, so this repo goes back to normal per-PR CI on main.

Changes

This reverts this repo's rollout commits (5ad7773 ef5ecfc a3944f0 edefd7c):

  • Job if: trunk gates: removed, so CI runs on every pull request and on pushes to main again, as before the rollout.
  • .github/workflows/trunk-guard.yml: deleted. It would fail any non-trunk PR into main, this one included.
  • Merge-train snippet: the @agent-relay/merge-train-snippet block is removed from AGENTS.md, along with its prpm.lock entry. CLAUDE.md changes only where it's a regular file that carried the snippet; symlinked CLAUDE.md files are untouched.

The merge-train port that was merged into trunk was never promoted, so it's discarded with trunk. Open PRs into trunk get retargeted to main after this merges.

Verification

CI can't run before merge: main's trunk gates only run CI for trunk heads. Checked locally instead:

  • actionlint on ci.yml, contract.yml and relayfile-evals.yml: clean.
  • No remaining references to trunk-guard, head_ref == 'trunk' or merge-train outside docs.

Push CI on main after merge exercises the restored workflows.

🤖 Generated with Claude Code


Note

Low Risk
Changes only GitHub Actions workflows and agent documentation; no runtime, auth, or data-path code.

Overview
Restores standard per-PR CI by removing the merge-train rollout: every job in ci.yml, contract.yml, and relayfile-evals.yml no longer has the if: guard that limited runs to this repo’s trunk → main PR (or non-PR events).

The Trunk guard workflow (.github/workflows/trunk-guard.yml) is deleted, so PRs into main are no longer blocked unless the head branch is trunk.

Agent docs are aligned with cloud-only merge train: the @agent-relay/merge-train-snippet section is removed from AGENTS.md, and its entry is dropped from prpm.lock (with an updated lock generated timestamp).

Reviewed by Cursor Bugbot for commit 558270e. Bugbot is set up for automated code reviews on this repo. Configure here.


Agent Relay sessions

  • claude session a19d0f6e · opened via gh pr create · last active 2026-10-09

The merge train is cloud-only now. Reverts this repo's rollout commits
(5ad7773 ef5ecfc a3944f0 edefd7c): job-level trunk gates, trunk-guard.yml, and the
@agent-relay/merge-train-snippet block in AGENTS.md (plus its lock entry).
CI runs on every pull request and on pushes to main again.

Co-Authored-By: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
@coderabbitai

coderabbitai Bot commented Oct 9, 2026 •

Copy link
Copy Markdown

Review in Change Stack →

No actionable comments were generated in the recent review. 🎉

ℹ️ Recent review info
⚙️ Run configuration
  • Configuration used: Organization UI
  • Review profile: CHILL
  • Plan: Advanced
  • Run ID: 70aa8327-bcfd-43a2-886d-af68473f3797

📥 Commits

Reviewing files that changed from the base of the PR and between a82b068 and 558270e.


⛔ Files ignored due to path filters (1)
  • prpm.lock is excluded by !**/*.lock

📒 Files selected for processing (5)
  • .github/workflows/ci.yml
  • .github/workflows/contract.yml
  • .github/workflows/relayfile-evals.yml
  • .github/workflows/trunk-guard.yml
  • AGENTS.md

💤 Files with no reviewable changes (5)
  • .github/workflows/trunk-guard.yml
  • AGENTS.md
  • .github/workflows/contract.yml
  • .github/workflows/relayfile-evals.yml
  • .github/workflows/ci.yml

Included review availability: This review used your included allowance. Your plan provides up to 1 included review per hour; 0 remain after this review.



📝 Walkthrough

Walkthrough

The pull request removes branch and repository conditions from several workflow jobs. It also removes the trunk-guard workflow and the related merge-train instructions from AGENTS.md.

Changes

Pull request workflow gating

Layer / File(s) Summary
Workflow job eligibility
.github/workflows/ci.yml, .github/workflows/contract.yml, .github/workflows/relayfile-evals.yml
Removed job-level conditions that restricted runs by pull-request branch or repository. The existing key-check and provider-eval step conditions remain in relayfile-evals.yml.
Trunk guard and merge-train instructions
.github/workflows/trunk-guard.yml, AGENTS.md
Deleted the workflow that rejected pull requests from non-trunk branches or other repositories. Removed the merge-train instructions from AGENTS.md.

Priority: ⬇️ Low

Estimated code review effort: 2 (Simple) | ~10 minutes

Change: Bug fix


Merge Risk: ⚪ Minimal · up to 55827

The restored per-PR checks have no identified blocker. Fork PRs will run CI and Contract checks, while provider evals remain restricted to same-repository PRs.

🚥 Pre-merge checks | ✅ 5
✅ Passed checks (5 passed)
Check name Status Explanation
Title check Passed The title clearly and concisely summarizes the main changes: removing trunk-based CI gating and the merge-train documentation.
Description check Passed The description directly explains the CI changes, workflow deletion, documentation cleanup, rationale, and verification steps. It is relevant to the changeset.
Docstring Coverage Passed No functions found in the changed files to evaluate docstring coverage. Skipping docstring coverage check. Docstring coverage is scoped to functions touched by this diff. Analyzed 0 functions across 0…
Linked Issues check Passed Check skipped because no linked issues were found for this pull request.
Out of Scope Changes check Passed Check skipped because no linked issues were found for this pull request.


✨ Finishing Touches 💡 1
🛠️ Fix failing CI checks 💡
  • Commit to this branch
  • Create a new PR

🧪 Generate unit tests (beta)
  • Commit to this branch
  • Create a new PR


  • Autofix · Keep fixing CodeRabbit findings and required CI, and resolving merge conflicts

Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out.

❤️ Share

A rabbit checks the workflow gate
The branch rules no longer wait
The trunk guard leaves the scene
The docs now show a different routine
Then hops away, with checks in flight

Comment @coderabbitai help to get the list of available commands.

@cubic-dev-ai cubic-dev-ai Bot left a comment

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

No issues found across 6 files

View guided diff | Re-trigger cubic

@devin-ai-integration devin-ai-integration Bot left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Devin Review found 1 potential issue.

Devin Review


jobs:
evals:
if: (github.event_name != 'pull_request' && github.event_name != 'pull_request_target') || (github.head_ref == 'trunk' && github.event.pull_request.head.repo.full_name == github.repository && github.base_ref == 'main')

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

🟥 Fork PRs can modify repository reviews

On a fork PR, evals now reaches the comment step with a write-capable token. The PR checkout supplies its script, so the contributor can use that token to alter repository pull-request comments.

Devin Review


Was this helpful? React with 👍 or 👎 to provide feedback.

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Not valid for this workflow. relayfile-evals.yml triggers on pull_request, not pull_request_target, and this repo is public. GitHub always gives a fork's pull_request run a read-only GITHUB_TOKEN and no secrets, whatever permissions: declares, so pull-requests: write only applies to same-repo PRs and pushes. This PR also only restores the pre-rollout job definition by removing the trunk gate line; nothing else in the workflow changes.

@github-actions

github-actions Bot commented Oct 9, 2026

Copy link
Copy Markdown

Relayfile Eval Review

Run: .relayfile/evals/runs/2026-10-09T15-44-02-289Z-HEAD-provider
Mode: provider
Git SHA: 47b1e4f

Passed: 4 | Needs human: 0 | Reviewable: 0 | Missing output: 0 | Failed: 0 | Skipped: 0

Human Review Cases

No reviewable human-review cases captured Relayfile output.

@kjgbot
kjgbot merged commit 4c2b2dd into main Oct 9, 2026
14 of 17 checks passed
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.

1 participant