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

Gitian: refresh the stale Monero dir via --setup switch #8296

Conversation

mj-xmr
Copy link
Contributor

@mj-xmr mj-xmr commented Apr 27, 2022

Prevents symptoms such as:

Submodule 'external/miniupnp' is not up-to-date.

during performing "Reproducible Builds".

A much less obtrusive alternative to #8292

Here I'm simply deleting the monero directory via the --setup switch and allow it to be cloned from scratch.
Thanks to @hyc for pointing out the easy way.

@mj-xmr mj-xmr force-pushed the gitian-refresh-submodules-del-monero-dir branch from 59fe6b1 to a00e51c Compare April 27, 2022 04:45
@jeffro256
Copy link
Contributor

jeffro256 commented Apr 27, 2022

Ah, the good ole "turn it off and turn it back on" :)

Where are the submodules populated in this script, and could you simplify the script by adding --recursive when cloning monero repo?

@mj-xmr
Copy link
Contributor Author

mj-xmr commented Apr 27, 2022

Where are the submodules populated in this script, and could you simplify the script by adding --recursive when cloning monero repo?

Unfortunately the problem is, that they're (re-)populated in the gitian-build project, effectively overwriting what you'd do here, like you can see in #8292 . That project is out of our control and patching it like I did, requires a leap of faith form the Reviewers/Users.

Even though it sounds ok for the gitian-build to download the subs, the script doesn't properly synchronize them, after we update our references in Monero to the new versions of the submodules.

@jeffro256
Copy link
Contributor

Ah, which was why you changed the gitian repo URL in the other PR, makes sense. It seems like Bitcoin Core plans on sunsetting gitian-build in favor of GUIX, so maybe we will have to maintain our own gitian anyways sometime in the future. At any rate, I like this solution much better.

@mj-xmr mj-xmr force-pushed the gitian-refresh-submodules-del-monero-dir branch from ea30b72 to 61d0712 Compare June 6, 2022 13:53
@mj-xmr
Copy link
Contributor Author

mj-xmr commented Jun 6, 2022

@jeffro256 : Resolved conflicts

@luigi1111 luigi1111 merged commit 622f251 into monero-project:master Jul 3, 2022
@mj-xmr mj-xmr deleted the gitian-refresh-submodules-del-monero-dir branch September 20, 2022 10:27
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.

4 participants