chore: bump cargo_metadata from 0.12.0 to 0.13.1 (#17999)
* chore: bump cargo_metadata from 0.12.0 to 0.13.1 Bumps [cargo_metadata](https://github.com/oli-obk/cargo_metadata) from 0.12.0 to 0.13.1. - [Release notes](https://github.com/oli-obk/cargo_metadata/releases) - [Commits](https://github.com/oli-obk/cargo_metadata/commits) --- updated-dependencies: - dependency-name: cargo_metadata dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> * Accommodate type change Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Tyera Eulberg <tyera@solana.com>
This commit is contained in:
33
Cargo.lock
generated
33
Cargo.lock
generated
@ -567,12 +567,33 @@ dependencies = [
|
|||||||
]
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "cargo_metadata"
|
name = "camino"
|
||||||
version = "0.12.0"
|
version = "1.0.4"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "d5a5f7b42f606b7f23674f6f4d877628350682bc40687d3fae65679a58d55345"
|
checksum = "d4648c6d00a709aa069a236adcaae4f605a6241c72bf5bee79331a4b625921a9"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
|
"serde",
|
||||||
|
]
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "cargo-platform"
|
||||||
|
version = "0.1.1"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "0226944a63d1bf35a3b5f948dd7c59e263db83695c9e8bffc4037de02e30f1d7"
|
||||||
|
dependencies = [
|
||||||
|
"serde",
|
||||||
|
]
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "cargo_metadata"
|
||||||
|
version = "0.13.1"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "081e3f0755c1f380c2d010481b6fa2e02973586d5f2b24eebb7a2a1d98b143d8"
|
||||||
|
dependencies = [
|
||||||
|
"camino",
|
||||||
|
"cargo-platform",
|
||||||
"semver 0.11.0",
|
"semver 0.11.0",
|
||||||
|
"semver-parser 0.10.2",
|
||||||
"serde",
|
"serde",
|
||||||
"serde_json",
|
"serde_json",
|
||||||
]
|
]
|
||||||
@ -3828,7 +3849,7 @@ version = "0.11.0"
|
|||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "f301af10236f6df4160f7c3f04eec6dbc70ace82d23326abad5edee88801c6b6"
|
checksum = "f301af10236f6df4160f7c3f04eec6dbc70ace82d23326abad5edee88801c6b6"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"semver-parser 0.10.1",
|
"semver-parser 0.10.2",
|
||||||
"serde",
|
"serde",
|
||||||
]
|
]
|
||||||
|
|
||||||
@ -3846,9 +3867,9 @@ checksum = "388a1df253eca08550bef6c72392cfe7c30914bf41df5269b68cbd6ff8f570a3"
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "semver-parser"
|
name = "semver-parser"
|
||||||
version = "0.10.1"
|
version = "0.10.2"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "42ef146c2ad5e5f4b037cd6ce2ebb775401729b19a82040c1beac9d36c7d1428"
|
checksum = "00b0bef5b7f9e0df16536d3961cfb6e84331c065b4066afb39768d0e319411f7"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"pest",
|
"pest",
|
||||||
]
|
]
|
||||||
|
@ -13,7 +13,7 @@ publish = false
|
|||||||
bzip2 = "0.3.3"
|
bzip2 = "0.3.3"
|
||||||
clap = "2.33.3"
|
clap = "2.33.3"
|
||||||
regex = "1.5.4"
|
regex = "1.5.4"
|
||||||
cargo_metadata = "0.12.0"
|
cargo_metadata = "0.13.1"
|
||||||
solana-sdk = { path = "..", version = "=1.8.0" }
|
solana-sdk = { path = "..", version = "=1.8.0" }
|
||||||
solana-download-utils = { path = "../../download-utils", version = "=1.8.0" }
|
solana-download-utils = { path = "../../download-utils", version = "=1.8.0" }
|
||||||
tar = "0.4.35"
|
tar = "0.4.35"
|
||||||
|
@ -372,10 +372,7 @@ fn build_bpf_package(config: &Config, target_directory: &Path, package: &cargo_m
|
|||||||
|
|
||||||
let legacy_program_feature_present = package.name == "solana-sdk";
|
let legacy_program_feature_present = package.name == "solana-sdk";
|
||||||
let root_package_dir = &package.manifest_path.parent().unwrap_or_else(|| {
|
let root_package_dir = &package.manifest_path.parent().unwrap_or_else(|| {
|
||||||
eprintln!(
|
eprintln!("Unable to get directory of {}", package.manifest_path);
|
||||||
"Unable to get directory of {}",
|
|
||||||
package.manifest_path.display()
|
|
||||||
);
|
|
||||||
exit(1);
|
exit(1);
|
||||||
});
|
});
|
||||||
|
|
||||||
@ -392,8 +389,7 @@ fn build_bpf_package(config: &Config, target_directory: &Path, package: &cargo_m
|
|||||||
env::set_current_dir(&root_package_dir).unwrap_or_else(|err| {
|
env::set_current_dir(&root_package_dir).unwrap_or_else(|err| {
|
||||||
eprintln!(
|
eprintln!(
|
||||||
"Unable to set current directory to {}: {}",
|
"Unable to set current directory to {}: {}",
|
||||||
root_package_dir.display(),
|
root_package_dir, err
|
||||||
err
|
|
||||||
);
|
);
|
||||||
exit(1);
|
exit(1);
|
||||||
});
|
});
|
||||||
@ -553,7 +549,7 @@ fn build_bpf(config: Config, manifest_path: Option<PathBuf>) {
|
|||||||
|
|
||||||
if let Some(root_package) = metadata.root_package() {
|
if let Some(root_package) = metadata.root_package() {
|
||||||
if !config.workspace {
|
if !config.workspace {
|
||||||
build_bpf_package(&config, &metadata.target_directory, root_package);
|
build_bpf_package(&config, &metadata.target_directory.as_ref(), root_package);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -574,7 +570,7 @@ fn build_bpf(config: Config, manifest_path: Option<PathBuf>) {
|
|||||||
.collect::<Vec<_>>();
|
.collect::<Vec<_>>();
|
||||||
|
|
||||||
for package in all_bpf_packages {
|
for package in all_bpf_packages {
|
||||||
build_bpf_package(&config, &metadata.target_directory, package);
|
build_bpf_package(&config, &metadata.target_directory.as_ref(), package);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -11,7 +11,7 @@ publish = false
|
|||||||
|
|
||||||
[dependencies]
|
[dependencies]
|
||||||
clap = "2.33.3"
|
clap = "2.33.3"
|
||||||
cargo_metadata = "0.12.0"
|
cargo_metadata = "0.13.1"
|
||||||
|
|
||||||
[[bin]]
|
[[bin]]
|
||||||
name = "cargo-test-bpf"
|
name = "cargo-test-bpf"
|
||||||
|
@ -78,7 +78,7 @@ fn test_bpf_package(config: &Config, target_directory: &Path, package: &cargo_me
|
|||||||
.cloned()
|
.cloned()
|
||||||
.unwrap_or_else(|| format!("{}", target_directory.join("deploy").display()));
|
.unwrap_or_else(|| format!("{}", target_directory.join("deploy").display()));
|
||||||
|
|
||||||
let manifest_path = format!("{}", package.manifest_path.display());
|
let manifest_path = format!("{}", package.manifest_path);
|
||||||
let mut cargo_args = vec!["--manifest-path", &manifest_path];
|
let mut cargo_args = vec!["--manifest-path", &manifest_path];
|
||||||
if config.no_default_features {
|
if config.no_default_features {
|
||||||
cargo_args.push("--no-default-features");
|
cargo_args.push("--no-default-features");
|
||||||
@ -143,7 +143,7 @@ fn test_bpf(config: Config, manifest_path: Option<PathBuf>) {
|
|||||||
|
|
||||||
if let Some(root_package) = metadata.root_package() {
|
if let Some(root_package) = metadata.root_package() {
|
||||||
if !config.workspace {
|
if !config.workspace {
|
||||||
test_bpf_package(&config, &metadata.target_directory, root_package);
|
test_bpf_package(&config, &metadata.target_directory.as_ref(), root_package);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -164,7 +164,7 @@ fn test_bpf(config: Config, manifest_path: Option<PathBuf>) {
|
|||||||
.collect::<Vec<_>>();
|
.collect::<Vec<_>>();
|
||||||
|
|
||||||
for package in all_bpf_packages {
|
for package in all_bpf_packages {
|
||||||
test_bpf_package(&config, &metadata.target_directory, package);
|
test_bpf_package(&config, &metadata.target_directory.as_ref(), package);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user