fix: macOS bitflags pin + engine amsterdam BAL fixtures#6
Open
edg-l wants to merge 2 commits into
Open
Conversation
bitflags 2.12.0 breaks dispatch2 0.3.1 compilation on macOS with a recursion-limit error in its bitflags! macro expansion. dispatch2 0.3.1 is the latest release, so pin bitflags to the last working version.
The Amsterdam overlay pinned snobal-devnet-6, which predates the current BAL implementation, so the engine ef-test suite failed ~8.5k fixtures. Point at tests-bal@v7.2.0 (what the Amsterdam hive jobs use); the suite passes 83143/83143. Ports ethrex#6802 into the externalized tooling.
edg-l
changed the title
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
1 participant
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.
Two CI fixes for the externalized tooling.
1. Pin bitflags to 2.11.1 (macOS build)
The ef_tests blockchain suite fails to compile on macOS (
Test - macos-15in ethrex CI):bitflags 2.12.0deepened its macro expansion, pushingdispatch2 0.3.1's generatedbitflags!blocks past the default recursion limit.dispatch2is a macOS-only transitive dep and0.3.1is its latest release, so it can't be bumped. Pinbitflagsback to2.11.1inCargo.lock(lock-only; the ethrex workspace already buildsdispatch2 0.3.1fine onbitflags 2.11.1).2. Point engine amsterdam fixtures at tests-bal@v7.2.0
Ports ethrex#6802.
ef_tests/engine/.fixtures_url_amsterdampinnedsnobal-devnet-6@v1.1.0, which predates the current BAL implementation, somake -C ef_tests/engine testfailed ~8.5k fixtures. Point attests-bal@v7.2.0(same fixtures the Amsterdam hive jobs use); suite passes 83143/83143. Same tarball layout, no Makefile change.Follow-up
After merge, bump
TOOLING_REVin ethrex CI to the new tooling commit.