Extract rust-toolchain.toml channel, pass to submodules #4518
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
leighmcculloch
previously approved these changes
Oct 24, 2024
leighmcculloch
approved these changes
Oct 24, 2024
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.
This is a somewhat crude but straightforward fix to the problem of version mismatches between the rust-toolchain.toml files stored in the stellar-core repo and those stored in the rs-soroban-env submodules: the makefile now extracts the channel name and appends it, explicitly, to all cargo invocations it makes.
I.e. if stellar-core's
rust-toolchain.tomlfile sayschannel = "1.81.0", the makefile will runcargo +1.81.0 buildin all the submodules, overriding whatever they have in their ownrust-toolchain.tomlfiles.We may wish to tweak this further, or to add additional build variants to the CI matrix of either this repo or rs-soroban-env, but I think this sort of "make sure they're all the same" step is basically going to be a part of any correct solution to the problem anyways, so I think we should probably at least start with it.