Skip to content

rust: require a tag reth pin before a reth PR leaves draft - #24071

Merged
op-will merged 4 commits into
developfrom
seb/reth-fork-tag-pin-gate
Nov 11, 2026
Merged

op-will merged 4 commits into
developfrom
seb/reth-fork-tag-pin-gate

Conversation

@sebastianst

@sebastianst sebastianst commented Nov 11, 2026 •

Copy link
Copy Markdown
Member

#24024 merged with reth pinned by rev to the head of an unmerged fork PR stack. Once those fork PRs squash- or rebase-merge, develop pins a commit that no fork branch contains. The docs already said to switch to a tag before merging, but nothing enforced it.

  • A new required check, rust-reth-tag-pin, fails while reth is pinned by rev, while any tracked Cargo.lock resolves a reth crate from another source than that tag and repository (lockfile scan taken from rust-ci: Require the reth fork to be pinned by tag #24070, which this supersedes), and while an op-<base>-<n> fork tag's commit is not on its op-<base> branch (checked with GitHub's compare API). A reth PR can still use a fork commit rev during development, but the check stays red, so the PR stays in draft until a v<semver> or op-<base>-<n> tag replaces the rev.
  • A new fork branch op-v<version> starts at the upstream tag and is prepared in one prep PR holding every cherry-pick and CI fix. The prep PR is rebase-merged, which keeps each commit's -x source line for the next update's audit.
  • The update-reth skill gains the draft/merge gate. The reth-update-reviewer agent reports a rev pin as blocking merge, and audits cherry-picks from the old fork branch's tip rather than its last tag.

Repin: develop pinned rev = 0447ceb from #24024, the head of a fork PR stack that has since been rebase-merged, so no fork branch contains that commit. This PR pins op-v2.7.0-0, the tag on op-v2.7.0's tip df85687cdb. Its code is identical to 0447ceb's: the two commits differ only in the fork's .github/workflows/book.yml. The UPSTREAM-MIRROR tags advance accordingly. Only the reth source string changes in Cargo.lock.

🤖 Co-created with Claude Opus 5.5

Comment thread rust/scripts/upstream-mirrors.py Resolved
Comment thread rust/UPDATING-RETH.md Resolved
Comment thread rust/UPDATING-RETH.md Resolved
Comment thread .claude/skills/update-reth/SKILL.md Resolved
Comment thread rust/scripts/upstream-mirrors.py Resolved
Comment thread rust/scripts/test_upstream_mirrors.py Resolved
Comment thread rust/scripts/upstream-mirrors.py Resolved
Comment thread .circleci/continue/rust-ci.yml Resolved
sebastianst and others added 2 commits November 11, 2026 20:47
A reth update or fork-change PR may pin a fork commit by rev during
development, but stays in draft until the fork branch is prepared and
tagged. The new required rust-reth-tag-pin check fails on any rev pin,
so it stays red on the draft until the tag replaces the rev.

A new op-v<version> fork branch is prepared in one prep PR holding every
cherry-pick and CI fix, merged with rebase-merge so each commit keeps its
-x source line for the next update's audit.

The update-reth skill gains the draft/merge gate, and the
reth-update-reviewer agent reports a rev pin as blocking merge and audits
cherry-picks from the old fork branch's tip.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Addresses review: every reth git source in every tracked Cargo.lock must
resolve through the workspace's tag and repository, whatever its host or
scheme; errors are grouped per source and collected across lockfiles.
Tests cover tracked_lockfiles and the --check-tag-pin CLI path. The docs
name op-<sha>-<n> fork tags correctly, wait for fork CI on a rebase-merged
prep PR before tagging, and route untagged targets through a fork branch.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
@sebastianst
sebastianst force-pushed the seb/reth-fork-tag-pin-gate branch from ea8ad35 to 0e3f865 Compare November 11, 2026 19:48
op-will
op-will previously approved these changes Nov 11, 2026

@op-will op-will 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.

Approving. All my earlier comments are addressed. Please fix the two inline comments before this merges or as a follow-up. Both are small gaps in what the required check actually proves.

Comment thread rust/scripts/upstream-mirrors.py Resolved
Comment thread rust/UPDATING-RETH.md Resolved
sebastianst and others added 2 commits November 11, 2026 21:04
…nch fork tag

Addresses review: the check fails when no tracked lockfile holds a reth
git source, and asks GitHub's compare API whether an op-<base>-<n> fork
tag's commit is on its op-<base> branch, failing closed after retries.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Replaces the rev pin on 0447ceb, the head of the unmerged fork PR stack,
with the tag on op-v2.7.0's tip df85687cdb. The two commits differ only
in the fork's .github/workflows/book.yml, so the code is unchanged; the
UPSTREAM-MIRROR tags advance from rev:0447ceb to op-v2.7.0-0.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
@sebastianst
sebastianst marked this pull request as ready for review November 11, 2026 20:13
@sebastianst
sebastianst requested a review from a team as a code owner November 11, 2026 20:13
@sebastianst
sebastianst added this pull request to the merge queue Nov 11, 2026
@github-merge-queue
github-merge-queue Bot removed this pull request from the merge queue due to no response for status checks Nov 11, 2026
@op-will
op-will added this pull request to the merge queue Nov 11, 2026
Merged via the queue into develop with commit 72fcf94 Nov 11, 2026
145 of 154 checks passed
@op-will
op-will deleted the seb/reth-fork-tag-pin-gate branch November 11, 2026 21:47
teddyknox added a commit that referenced this pull request Nov 16, 2026
develop dropped rust-doctest from required-rust-ci, because `just test`
in rust-tests already runs the doc tests (#24192), and added
rust-reth-tag-pin (#24071). It also added a toolchain pin check to the
rust-fmt job.

RWX now matches: the doctest task is gone (tests-compiler still runs the
doc tests), a rust-reth-tag-pin task runs the same script as CircleCI,
and rust-fmt runs CircleCI's own toolchain pin check, read from its
config so it cannot drift. pr-gates.json follows CircleCI's new list,
and circle-alignment.py passes again.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
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.

3 participants