Skip to content

fix(ci): resolve foundry lockfile conflicts after reth bumps in foundry-patch.sh#3884

Merged
0xrusowsky merged 1 commit into
mainfrom
fgimenez/foundry-patch-resolve-conflicts
May 11, 2026
Merged

fix(ci): resolve foundry lockfile conflicts after reth bumps in foundry-patch.sh#3884
0xrusowsky merged 1 commit into
mainfrom
fgimenez/foundry-patch-resolve-conflicts

Conversation

@fgimenez
Copy link
Copy Markdown
Member

When a reth bump tightens a constraint on a transitive crate already pinned in foundry's lockfile (e.g. reth requires alloy-eip7928 ^0.3.6 while foundry's lock has 0.3.5), cargo metadata fails and Forge Test (Rust Precompiles)
breaks for any PR that touches tips/verify/**, crates/contracts/**, or crates/precompiles/**.

Example failure https://github.com/tempoxyz/tempo/actions/runs/25663969326/job/75331584394

This PR makes scripts/foundry-patch.sh parse the conflicting package out of the cargo metadata error, run cargo update -p <pkg> for it, and retry. Loops while there are pending conflicts and bails out if the same crate fails twice in a row.

@fgimenez fgimenez requested review from 0xrusowsky and emmajam May 11, 2026 11:03
@fgimenez fgimenez requested a review from 0xKitsune as a code owner May 11, 2026 11:03
@fgimenez fgimenez added C-test A change that impacts how or what we test A-ci Related to github workflows or other build and lint tools labels May 11, 2026
@0xrusowsky 0xrusowsky added this pull request to the merge queue May 11, 2026
Merged via the queue into main with commit 51bb612 May 11, 2026
37 checks passed
@0xrusowsky 0xrusowsky deleted the fgimenez/foundry-patch-resolve-conflicts branch May 11, 2026 12:00
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

A-ci Related to github workflows or other build and lint tools C-test A change that impacts how or what we test

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants