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

Remove --locked for cli-arg based patch... #31971

Merged
merged 1 commit into from
Jun 5, 2023

Conversation

ryoqun
Copy link
Member

@ryoqun ryoqun commented Jun 5, 2023

Problem

I'm a bad guy who is testing in the production environment (of ci). T_T

so, it turned out that cargo --config ... based patching doesn't work in combination with --locked. thinking about the purpose of --locked, it does make sense.

That means the patched ntapi won't be used and windows build fails still...........

https://github.com/solana-labs/solana/actions/runs/5177053842/jobs/9326670925#step:6:2691 :

Updating git repository `https://github.com/solana-labs/ntapi`
warning: Patch `ntapi v0.3.6 (https://github.com/solana-labs/ntapi?rev=5980bbab2e0501a8100eb88c12222d664ccb3a0a#5980bbab)` was not used in the crate graph.
Check that the patched package version and available features are compatible
with the dependency requirements. If the patch has a different version from
what is locked in the Cargo.lock file, run `cargo update` to use the new
version. This may also occur with an optional dependency that is not enabled.
warning: package `h2 v0.3.17` in Cargo.lock is yanked in registry `crates-io`, consider running without --locked
    Updating git repository `[https://github.com/solana-labs/ntapi`](https://github.com/solana-labs/ntapi%60)
warning: Patch `ntapi v0.3.6 (https://github.com/solana-labs/ntapi?rev=5980bbab2e0501a8100eb88c12222d664ccb3a0a#5980bbab)` was not used in the crate graph.
Check that the patched package version and available features are compatible
with the dependency requirements. If the patch has a different version from
what is locked in the Cargo.lock file, run `cargo update` to use the new
version. This may also occur with an optional dependency that is not enabled.
 Downloading crates ...
  Downloaded alloc-no-stdlib v2.0.4
  Downloaded libc v0.2.141

as an excuse, i rightfully tested at my fork's github actions to verify cli-arg based patching is working.... but i originally forgot to pass --locked at that time... this time, i confirmed giving --locked produce the above warn as well in my fork build, implying the existence of --locked was significant...

Summary of Changes

Remove --locked for now. obviously, this kind of change isn't backportable to v1.16. so, solana-labs/solana-program-library#4471 is now blocker for windows binary for v1.16.x.

Fixes #

@ryoqun ryoqun requested a review from yihau June 5, 2023 13:13
@ryoqun ryoqun merged commit 6b33ff8 into solana-labs:master Jun 5, 2023
8 of 10 checks passed
ryoqun added a commit to ryoqun/solana that referenced this pull request Jun 6, 2023
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
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants