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

Shift crossbeam comment for upcoming 2nd patch... #31963

Merged
merged 1 commit into from
Jun 5, 2023

Conversation

ryoqun
Copy link
Member

@ryoqun ryoqun commented Jun 5, 2023

Problem

Summary of Changes

Fixes #

@ryoqun ryoqun requested a review from yihau June 5, 2023 04:54
Copy link
Member

@yihau yihau left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

🪖

@ryoqun ryoqun added the automerge Merge this Pull Request automatically once CI passes label Jun 5, 2023
@mergify mergify bot merged commit 828a590 into solana-labs:master Jun 5, 2023
20 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
automerge Merge this Pull Request automatically once CI passes
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants