Skip to content
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

feat: fix scripts to use different paths if mina is a submodule of o1js #14229

Merged
merged 4 commits into from
Jan 4, 2024

Conversation

MartinMinkov
Copy link
Contributor

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

@MartinMinkov
Copy link
Contributor Author

!ci-build-me

@MartinMinkov MartinMinkov force-pushed the feat/o1js-add-mina-submodule-support branch 3 times, most recently from fab8e5e to f17a572 Compare October 4, 2023 16:06
@MartinMinkov
Copy link
Contributor Author

!ci-build-me

@MartinMinkov MartinMinkov force-pushed the feat/o1js-add-mina-submodule-support branch 2 times, most recently from 3032a30 to 4f20eb6 Compare October 23, 2023 19:14
@MartinMinkov
Copy link
Contributor Author

!ci-build-me

@MartinMinkov MartinMinkov force-pushed the feat/o1js-add-mina-submodule-support branch from 0cdbb7b to 2a6881d Compare January 4, 2024 05:50
@MartinMinkov MartinMinkov requested review from a team as code owners January 4, 2024 05:50
@MartinMinkov MartinMinkov force-pushed the feat/o1js-add-mina-submodule-support branch from 905f450 to 4f20eb6 Compare January 4, 2024 06:09
@deepthiskumar
Copy link
Member

!ci-build-me

@deepthiskumar
Copy link
Member

!approved-for-mainnet

@deepthiskumar deepthiskumar merged commit ec9ed09 into rampup Jan 4, 2024
38 checks passed
@deepthiskumar deepthiskumar deleted the feat/o1js-add-mina-submodule-support branch January 4, 2024 21:20
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants