-
Notifications
You must be signed in to change notification settings - Fork 337
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Refactor Bonsai as workspace and use Foundry as external dependency #810
Merged
Conversation
This file contains 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
SchmErik
reviewed
Aug 24, 2023
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
not sure what's going on exactly but disabling the test seems to be causing CI to fail
flaub
reviewed
Aug 24, 2023
.github/workflows/bonsai.yml
Outdated
foundry: | ||
test: |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I wonder if this rename is the culprit for stalled jobs
flaub
approved these changes
Aug 25, 2023
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.
Currently on
main
the Foundry tools, includingforge
are declared as build dependencies inbonsai/ethereum/Cargo.toml
and so Foundry is built as part of building and testing therisc0
repo.This turns out to be problematic, with the largest issue being dependency conflicts that keep breaking builds on different developer machines.
Foundry CLI is not meant to be imported as a Rust dependency, and it is becoming clear the that it should not be used as such.
This PR first refactors the build for
bonsai/ethereum
contracts to callforge
as a subprocess rather than building and running it in-process.If this is done alone, a consequence is that building
risc0
will require installing the Foundry tools, even if the developer has no interest in Ethereum integration or Bonsai.In order to address this, the
bonsai
directory is refactored as its own workspace.