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

Merged
KJ
13d ago
+1-93

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 (5ad77734 ef5ecfc0 a3944f09 edefd7cc):

  • 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 558270e55bacc7acfdffc53056ebaf9e0b9bb060. 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