[berkeley] feat: fix scripts to use different paths if mina is a submodule of o1js #14239
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
|
!ci-build-me |
querolita
approved these changes
Oct 2, 2023
ghost-not-in-the-shell
approved these changes
Oct 2, 2023
MartinMinkov
force-pushed
the
feat/o1js-add-mina-submodule-support-berkeley
branch
from
75d3a17 to
99de50f
Compare
|
!ci-build-me |
MartinMinkov
force-pushed
the
feat/o1js-add-mina-submodule-support-berkeley
branch
2 times, most recently
from
795bf01 to
a8e13d3
Compare
MartinMinkov
force-pushed
the
feat/o1js-add-mina-submodule-support-berkeley
branch
from
a8e13d3 to
4f20eb6
Compare
|
|
|
!ci-build-me |
|
|
|
!ci-build-me |
shimkiv
approved these changes
Dec 20, 2023
|
!ci-build-me |
| @@ -1,7 +1,7 @@ | |||
| (library | |||
| (name libp2p_ipc) | |||
| (public_name libp2p_ipc) | |||
| (flags -w -53) | |||
| (flags -w -53-55) | |||
There was a problem hiding this comment.
Fair question! Nix fails while building libnp2p_ipcs, ignoring warning 55 while building src/libp2p_ipcs/libp2p_ipcs_capnp.ml seems to fix it. See this internal discussion for more details.
|
!ci-build-me |
|
Moved too #14782 |
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.
Explain your changes:
Fixes some of the scripts called by dune to use different absolute paths if we are building mina in the context of the o1js as mina being a submodule.
The issue occurs when we build o1js from the root directory with mina as a submodule. Dune will try to resolve some absolute paths from build scripts that will fail and not build o1js properly. To fix this, we conditionally check for submodule locations and change the paths if we have a mina submodule present, otherwise, we use the same build process. This lets us build mina the same way but also build o1js dependencies properly.
Explain how you tested your changes:
Built mina from the root directory to test normal building and built o1js using mina as a submodule successfully.
Addresses o1-labs/o1js#1096