Skip to content

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

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 (5413b76 c9c7b00 a0406c2 63402e2):

  • 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 and contract.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
Workflow and documentation-only revert; no application runtime or security logic changes.

Overview
Restores standard per-PR CI on main by removing the merge-train/trunk-only gating that had been rolled out in this repo.

The if: conditions on Build & Test (ci.yml) and SDK Contract Check (contract.yml) are dropped so those jobs run on every pull request targeting main (and on pushes to main) again. Trunk guard (.github/workflows/trunk-guard.yml) is deleted, so non-trunk PRs into main are no longer blocked.

Contributor docs are aligned with the old flow: the @agent-relay/merge-train-snippet section is removed from AGENTS.md, and its entry is removed from prpm.lock.

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

The merge train is cloud-only now. Reverts this repo's rollout commits
(5413b76 c9c7b00 a0406c2 63402e2): 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

Important

  • 🔍 Trigger review

This repository does not receive automatic reviews because it has fewer than 10 stars.

⚙️ Run configuration
  • Configuration used: Organization UI
  • Review profile: CHILL
  • Plan: Advanced
  • Run ID: dbd45a65-a437-413d-9fff-caddbf906b31

  • 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

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

@devin-ai-integration devin-ai-integration 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.

✅ Devin Review: No Issues Found

Devin Review analyzed this PR and found no bugs or issues to report.

Devin Review

@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 5 files

View guided diff | Re-trigger cubic

@kjgbot
kjgbot merged commit f7ec166 into main Oct 9, 2026
6 of 9 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