[o1js-main] feat: fix scripts to use different paths if mina is a submodule of o1js #14435
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
… upload on build artifacts job
finish up renaming
Fix/alerts filter
…again Remove duplicated build for Lucy in CI
1. Use memo and fee range 2. Make max_account_updates configurable 3. Change type string of zkapp in internal logging to `zkapp:<num acc upds>:<num proofs>` 4. Reduce checking interval in `wait_until_zkapps_deployed`
…ements Zkapp generator improvements
…-logs hardcode number of oversized logs
…height-6 Update account_subtree_height to 6
…k-pool-summury-to-status-graphql
…k-pool-summury-to-status-graphql
…ummury-to-status-graphql Add snark pool information to the status metrics query results
Raise balances 10x in berkeley ledger
…into-rampup-2023-10-05
…pup-2023-10-05 Merge berkeley into rampup
berkeley ledger timestamp bump
…d-mina-submodule-support-o1jsmain
MartinMinkov
changed the title
mitschabaude
approved these changes
Oct 25, 2023
|
!ci-build-me |
querolita
approved these changes
Oct 26, 2023
| mina_submodule=$(git submodule status | grep "mina" || true) | ||
|
|
||
| if [[ -n "$mina_submodule" ]]; then | ||
| marlin_submodule_dir=$(git -C "$git_root/src/mina" submodule status | grep proof-systems | sed 's/^[-\ ]//g' | cut -d ' ' -f 2) |
There was a problem hiding this comment.
Maybe rename this at the same time, no?
dannywillems
approved these changes
Oct 26, 2023
georgeee
approved these changes
Oct 26, 2023
mitschabaude
deleted the
feat/o1js-add-mina-submodule-support-o1jsmain
branch
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.