Restore ntapi patching #32488
Merged
Restore ntapi patching #32488
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
|
(I'll merge this as soon as i got r+ and ci checks has passed..) |
CriesofCarrots
approved these changes
Jul 14, 2023
ryoqun
commented
Jul 14, 2023
Comment on lines
+147
to
+150
| "$cargo" $maybeRustVersion \ | ||
| --config 'patch.crates-io.ntapi.git="https://github.com/solana-labs/ntapi"' \ | ||
| --config 'patch.crates-io.ntapi.rev="97ede981a1777883ff86d142b75024b023f04fad"' \ | ||
| install --locked spl-token-cli --root "$installDir" |
There was a problem hiding this comment.
oh, i see now. this lines are actually needed until spl-token-cli starts to use published solana monorepo crates which is using the bumped tokio.
for now, it's not the case...
this means i need further follow up pr to really remove patching in Cargo.locks..
There was a problem hiding this comment.
Ohhh, makes sense. Thanks for hunting that!
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.
not tested at all :)
seems ntapi is still used somehow even after #32430
so, just restore the ntapi patch.
Fixes #