Skip to content
This repository has been archived by the owner on Jan 22, 2025. It is now read-only.

Patch ntapi to restore windows build #31961

Merged
merged 6 commits into from
Jun 5, 2023
Merged

Patch ntapi to restore windows build #31961

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
3ca5873
Patch ntapi to restore windows build
ryoqun Jun 4, 2023
c336dc9
Update Cargo.lock...
ryoqun Jun 5, 2023
5280bf0
Add comment for justification of this patching
ryoqun Jun 5, 2023
be54d14
Revert "ci: stop windows building on master temporarily (#31353)"
ryoqun Jun 5, 2023
44c7c01
Use solana-labs fork
ryoqun Jun 5, 2023
6e951b4
Ugh..
ryoqun Jun 5, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/release-artifacts-auto.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ name: release-artifacts-auto
on:
push:
branches:
# - master
- master
Copy link
Contributor Author

Choose a reason for hiding this comment

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

hehe, i included this change as well in this pr... 🙏

- v[0-9]+.[0-9]+
tags:
- v[0-9]+.[0-9]+.[0-9]+
Expand Down
3 changes: 1 addition & 2 deletions Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 3 additions & 0 deletions Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -403,6 +403,9 @@ zstd = "0.11.2"
[patch.crates-io]
# for details, see https://github.com/solana-labs/crossbeam/commit/fd279d707025f0e60951e429bf778b4813d1b6bf
crossbeam-epoch = { git = "https://github.com/solana-labs/crossbeam", rev = "fd279d707025f0e60951e429bf778b4813d1b6bf" }
# Rust 1.69+ broke ntapi v0.3.x, which doesn't contain proper fix:
# https://github.com/MSxDOS/ntapi/pull/12
ntapi = { git = "https://github.com/solana-labs/ntapi", rev = "5980bbab2e0501a8100eb88c12222d664ccb3a0a" }

# We include the following crates as our dependencies above from crates.io:
#
Expand Down