Repository navigation
rust: require a tag reth pin before a reth PR leaves draft - #24071
Merged
Merged
Conversation
sebastianst
force-pushed
the
seb/reth-fork-tag-pin-gate
branch
from
November 11, 2026 18:25
7040aa8 to
ea8ad35
Compare
op-will
reviewed
Nov 11, 2026
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
force-pushed
the
seb/reth-fork-tag-pin-gate
branch
from
November 11, 2026 19:48
ea8ad35 to
0e3f865
Compare
op-will
previously approved these changes
Nov 11, 2026
…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
marked this pull request as ready for review
November 11, 2026 20:13
sebastianst
enabled auto-merge
November 11, 2026 20:21
op-will
approved these changes
Nov 11, 2026
github-merge-queue
Bot
removed this pull request from the merge queue due to no response for status checks
Nov 11, 2026
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>
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
#24024 merged with reth pinned by
revto the head of an unmerged fork PR stack. Once those fork PRs squash- or rebase-merge,developpins a commit that no fork branch contains. The docs already said to switch to a tag before merging, but nothing enforced it.rust-reth-tag-pin, fails while reth is pinned byrev, while any trackedCargo.lockresolves 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 anop-<base>-<n>fork tag's commit is not on itsop-<base>branch (checked with GitHub's compare API). A reth PR can still use a fork commitrevduring development, but the check stays red, so the PR stays in draft until av<semver>orop-<base>-<n>tag replaces therev.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-xsource line for the next update's audit.update-rethskill gains the draft/merge gate. Thereth-update-revieweragent reports arevpin as blocking merge, and audits cherry-picks from the old fork branch's tip rather than its last tag.Repin:
developpinnedrev = 0447cebfrom #24024, the head of a fork PR stack that has since been rebase-merged, so no fork branch contains that commit. This PR pinsop-v2.7.0-0, the tag onop-v2.7.0's tipdf85687cdb. Its code is identical to0447ceb's: the two commits differ only in the fork's.github/workflows/book.yml. TheUPSTREAM-MIRRORtags advance accordingly. Only the reth source string changes inCargo.lock.🤖 Co-created with Claude Opus 5.5