diff --git a/.github/workflows/release-artifacts-auto.yml b/.github/workflows/release-artifacts-auto.yml index 96179f05d6..a8309cdffc 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]+ diff --git a/Cargo.lock b/Cargo.lock index b5bbd73611..ff8e8b90ae 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/solana-labs/ntapi?rev=5980bbab2e0501a8100eb88c12222d664ccb3a0a#5980bbab2e0501a8100eb88c12222d664ccb3a0a" dependencies = [ "winapi 0.3.9", ] diff --git a/Cargo.toml b/Cargo.toml index 3ebe05617a..b1a8498721 100644 --- 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: #