From 3ca5873b9e2cb1365930425812fe1acd64c4fc2d Mon Sep 17 00:00:00 2001 From: Ryo Onodera Date: Sun, 4 Jun 2023 22:49:59 +0900 Subject: [PATCH 1/6] Patch ntapi to restore windows build --- Cargo.toml | 1 + 1 file changed, 1 insertion(+) diff --git a/Cargo.toml b/Cargo.toml index 3ebe05617a040a..14bab34612ca2b 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -403,6 +403,7 @@ 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" } +ntapi = { git = "https://github.com/ryoqun/ntapi", rev = "5980bbab2e0501a8100eb88c12222d664ccb3a0a" } # We include the following crates as our dependencies above from crates.io: # From c336dc9fdd481b08088eddba320a080c3993cff0 Mon Sep 17 00:00:00 2001 From: Ryo Onodera Date: Mon, 5 Jun 2023 09:48:15 +0900 Subject: [PATCH 2/6] Update Cargo.lock... --- Cargo.lock | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index b5bbd736118c04..bf01e7bb3ee369 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -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/ryoqun/ntapi?rev=5980bbab2e0501a8100eb88c12222d664ccb3a0a#5980bbab2e0501a8100eb88c12222d664ccb3a0a" dependencies = [ "winapi 0.3.9", ] From 5280bf0ad9e19de78e622462233c06d06a0b3bd6 Mon Sep 17 00:00:00 2001 From: Ryo Onodera Date: Mon, 5 Jun 2023 13:49:14 +0900 Subject: [PATCH 3/6] Add comment for justification of this patching https://github.com/MSxDOS/ntapi/issues/11 https://github.com/MSxDOS/ntapi/pull/12 --- Cargo.toml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Cargo.toml b/Cargo.toml index 14bab34612ca2b..3c507699962054 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -403,6 +403,8 @@ 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/ryoqun/ntapi", rev = "5980bbab2e0501a8100eb88c12222d664ccb3a0a" } # We include the following crates as our dependencies above from crates.io: From be54d142816b1e996da09eb3cb45fd3a208735cf Mon Sep 17 00:00:00 2001 From: Ryo Onodera Date: Mon, 5 Jun 2023 13:50:39 +0900 Subject: [PATCH 4/6] Revert "ci: stop windows building on master temporarily (#31353)" This reverts commit 2dcdfff5f49ba671cf1c51fbda6056af7f05fea2. --- .github/workflows/release-artifacts-auto.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/release-artifacts-auto.yml b/.github/workflows/release-artifacts-auto.yml index 96179f05d65a20..a8309cdffc8a72 100644 --- 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]+ tags: - v[0-9]+.[0-9]+.[0-9]+ From 44c7c019b4ec855ac03c49b81072a3158517f9da Mon Sep 17 00:00:00 2001 From: Ryo Onodera Date: Mon, 5 Jun 2023 13:58:50 +0900 Subject: [PATCH 5/6] Use solana-labs fork --- Cargo.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Cargo.toml b/Cargo.toml index 3c507699962054..b1a84987214767 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -405,7 +405,7 @@ zstd = "0.11.2" 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/ryoqun/ntapi", rev = "5980bbab2e0501a8100eb88c12222d664ccb3a0a" } +ntapi = { git = "https://github.com/solana-labs/ntapi", rev = "5980bbab2e0501a8100eb88c12222d664ccb3a0a" } # We include the following crates as our dependencies above from crates.io: # From 6e951b4b39a4a86e4953f4b646adf74a0b9315ae Mon Sep 17 00:00:00 2001 From: Ryo Onodera Date: Mon, 5 Jun 2023 14:01:38 +0900 Subject: [PATCH 6/6] Ugh.. --- Cargo.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Cargo.lock b/Cargo.lock index bf01e7bb3ee369..ff8e8b90aece87 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -3082,7 +3082,7 @@ checksum = "61807f77802ff30975e01f4f071c8ba10c022052f98b3294119f3e615d13e5be" [[package]] name = "ntapi" version = "0.3.6" -source = "git+https://github.com/ryoqun/ntapi?rev=5980bbab2e0501a8100eb88c12222d664ccb3a0a#5980bbab2e0501a8100eb88c12222d664ccb3a0a" +source = "git+https://github.com/solana-labs/ntapi?rev=5980bbab2e0501a8100eb88c12222d664ccb3a0a#5980bbab2e0501a8100eb88c12222d664ccb3a0a" dependencies = [ "winapi 0.3.9", ]