Patch ntapi more thoroughly #31970
Merged
Patch ntapi more thoroughly #31970
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
yihau
approved these changes
Jun 5, 2023
|
(I'll merge this as soon as check passes before waiting full ci run; technically master ci is broken right now....) |
ryoqun
commented
Jun 5, 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="5980bbab2e0501a8100eb88c12222d664ccb3a0a"' \ | ||
| install --locked spl-token-cli --root "$installDir" |
There was a problem hiding this comment.
here backref: solana-labs/solana-program-library#4471
There was a problem hiding this comment.
note that we needed to remove --locked as well: #31971
ryoqun
added a commit
to ryoqun/solana
that referenced
this pull request
Jun 6, 2023
* Patch spl-token-cli build as well... * Patch sbf/Cargo.toml for consistency
ryoqun
added a commit
that referenced
this pull request
Jun 6, 2023
* Shift crossbeam comment for upcoming 2nd patch... (#31963) * Patch ntapi to restore windows build (#31961) * Patch ntapi to restore windows build * Update Cargo.lock... * Add comment for justification of this patching MSxDOS/ntapi#11 MSxDOS/ntapi#12 * Revert "ci: stop windows building on master temporarily (#31353)" This reverts commit 2dcdfff. * Use solana-labs fork * Ugh.. * Patch ntapi more thoroughly (#31970) * Patch spl-token-cli build as well... * Patch sbf/Cargo.toml for consistency * Remove --locked for cli-arg based patch... (#31971) * Bump patched ntapi from v0.3.6 to v0.3.7 (#31981) * Revert "ci: stop windows build (#31893)" This reverts commit 30f9e43.
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.
Problem
We needed more tender and loving care for patching
ntapi, still breaking windows build after #31961Summary of Changes
patch moar!
(i'll create a proper pr at the spl-token repo...)
Fixes #