blockworks-foundation
/
solana
mirror of https://github.com/blockworks-foundation/solana.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Bump patched ntapi from v0.3.6 to v0.3.7 (#31981)

This commit is contained in:
Ryo Onodera 2023-06-06 13:33:57 +09:00 committed by GitHub
parent 841609959c
commit 4227d0ee35
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Cargo.lock generated
View File

@ -3081,8 +3081,8 @@ checksum = "61807f77802ff30975e01f4f071c8ba10c022052f98b3294119f3e615d13e5be"
[[package]] [[package]]
name = "ntapi" name = "ntapi"
version = "0.3.6" version = "0.3.7"
source = "git+https://github.com/solana-labs/ntapi?rev=5980bbab2e0501a8100eb88c12222d664ccb3a0a#5980bbab2e0501a8100eb88c12222d664ccb3a0a" source = "git+https://github.com/solana-labs/ntapi?rev=97ede981a1777883ff86d142b75024b023f04fad#97ede981a1777883ff86d142b75024b023f04fad"
dependencies = [ dependencies = [
"winapi 0.3.9", "winapi 0.3.9",
] ]

2
Cargo.toml
View File

@ -406,7 +406,7 @@ crossbeam-epoch = { git = "https://github.com/solana-labs/crossbeam", rev = "fd2
# Rust 1.69+ broke ntapi v0.3.x, which doesn't contain proper fix: # Rust 1.69+ broke ntapi v0.3.x, which doesn't contain proper fix:
# https://github.com/MSxDOS/ntapi/pull/12 # https://github.com/MSxDOS/ntapi/pull/12
ntapi = { git = "https://github.com/solana-labs/ntapi", rev = "5980bbab2e0501a8100eb88c12222d664ccb3a0a" } ntapi = { git = "https://github.com/solana-labs/ntapi", rev = "97ede981a1777883ff86d142b75024b023f04fad" }
# We include the following crates as our dependencies above from crates.io: # We include the following crates as our dependencies above from crates.io:
# #

4
programs/sbf/Cargo.lock generated
View File

@ -2825,8 +2825,8 @@ dependencies = [
[[package]] [[package]]
name = "ntapi" name = "ntapi"
version = "0.3.6" version = "0.3.7"
source = "git+https://github.com/solana-labs/ntapi?rev=5980bbab2e0501a8100eb88c12222d664ccb3a0a#5980bbab2e0501a8100eb88c12222d664ccb3a0a" source = "git+https://github.com/solana-labs/ntapi?rev=97ede981a1777883ff86d142b75024b023f04fad#97ede981a1777883ff86d142b75024b023f04fad"
dependencies = [ dependencies = [
"winapi 0.3.9", "winapi 0.3.9",
] ]

2
programs/sbf/Cargo.toml
View File

@ -162,7 +162,7 @@ targets = ["x86_64-unknown-linux-gnu"]
[patch.crates-io] [patch.crates-io]
# Rust 1.69+ broke ntapi v0.3.x, which doesn't contain proper fix: # Rust 1.69+ broke ntapi v0.3.x, which doesn't contain proper fix:
# https://github.com/MSxDOS/ntapi/pull/12 # https://github.com/MSxDOS/ntapi/pull/12
ntapi = { git = "https://github.com/solana-labs/ntapi", rev = "5980bbab2e0501a8100eb88c12222d664ccb3a0a" } ntapi = { git = "https://github.com/solana-labs/ntapi", rev = "97ede981a1777883ff86d142b75024b023f04fad" }
# We include the following crates as our dependencies from crates.io: # We include the following crates as our dependencies from crates.io:
# #

6
scripts/cargo-install-all.sh
View File

@ -142,12 +142,12 @@ mkdir -p "$installDir/bin"
# Exclude `spl-token` binary for net.sh builds # Exclude `spl-token` binary for net.sh builds
if [[ -z "$validatorOnly" ]]; then if [[ -z "$validatorOnly" ]]; then
# the config is work around and --locked is removed until we ship newer spl-token-cli... # the patch-related configs are needed for rust 1.69+ on Windows; see Cargo.toml
# shellcheck disable=SC2086 # Don't want to double quote $rust_version # shellcheck disable=SC2086 # Don't want to double quote $rust_version
"$cargo" $maybeRustVersion \ "$cargo" $maybeRustVersion \
--config 'patch.crates-io.ntapi.git="https://github.com/solana-labs/ntapi"' \ --config 'patch.crates-io.ntapi.git="https://github.com/solana-labs/ntapi"' \
--config 'patch.crates-io.ntapi.rev="5980bbab2e0501a8100eb88c12222d664ccb3a0a"' \ --config 'patch.crates-io.ntapi.rev="97ede981a1777883ff86d142b75024b023f04fad"' \
install spl-token-cli --root "$installDir" install --locked spl-token-cli --root "$installDir"
fi fi
) )