Patch ntapi to restore windows build (solana-labs#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 (solana-labs#31353)" This reverts commit 2dcdfff. * Use solana-labs fork * Ugh..
ryoqun · Jun 6, 2023 · 4a38aeb · 4a38aeb
1 parent 6bbce15
commit 4a38aeb
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 3 deletions.
diff --git a/.github/workflows/release-artifacts-auto.yml b/.github/workflows/release-artifacts-auto.yml
@@ -3,7 +3,7 @@ name: release-artifacts-auto
 on:
   push:
     branches:
-      # - master
+      - master
       - v[0-9]+.[0-9]+
       - '!v1.16'
     tags:

diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -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:
 #