Patch ntapi to restore windows build (#31961)

* Patch ntapi to restore windows build

* Update Cargo.lock...

* Add comment for justification of this patching

https://github.com/MSxDOS/ntapi/issues/11
https://github.com/MSxDOS/ntapi/pull/12

* Revert "ci: stop windows building on master temporarily (#31353)"

This reverts commit 2dcdfff5f4.

* Use solana-labs fork

* Ugh..
This commit is contained in:
Ryo Onodera 2023-06-05 16:51:43 +09:00 committed by GitHub
parent 828a590de6
commit 39770b2de1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 5 additions and 3 deletions

View File

@ -3,7 +3,7 @@ name: release-artifacts-auto
on:
push:
branches:
# - master
- master
- v[0-9]+.[0-9]+
tags:
- v[0-9]+.[0-9]+.[0-9]+

3
Cargo.lock generated
View File

@ -3082,8 +3082,7 @@ checksum = "61807f77802ff30975e01f4f071c8ba10c022052f98b3294119f3e615d13e5be"
[[package]]
name = "ntapi"
version = "0.3.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "3f6bb902e437b6d86e03cce10a7e2af662292c5dfef23b65899ea3ac9354ad44"
source = "git+https://github.com/solana-labs/ntapi?rev=5980bbab2e0501a8100eb88c12222d664ccb3a0a#5980bbab2e0501a8100eb88c12222d664ccb3a0a"
dependencies = [
"winapi 0.3.9",
]

View File

@ -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:
#