gaspersic/solana
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

chore: bump cargo_metadata from 0.12.0 to 0.13.1 (#17999)

Browse Source 
* 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:
dependabot[bot]
2021-06-16 17:50:22 +00:00
committed by GitHub
parent 71796f4951
commit d99b8f10d0
5 changed files with 36 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
sdk/cargo-build-bpf/src/main.rs
View File

@ -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 root_package_dir = &package.manifest_path.parent().unwrap_or_else(|| {
eprintln!(
"Unable to get directory of {}",
package.manifest_path.display()
);
eprintln!("Unable to get directory of {}", package.manifest_path);
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| {
eprintln!(
"Unable to set current directory to {}: {}",
root_package_dir.display(),
err
root_package_dir, err
);
exit(1);
});
@ -553,7 +549,7 @@ fn build_bpf(config: Config, manifest_path: Option<PathBuf>) {
if let Some(root_package) = metadata.root_package() {
if !config.workspace {
build_bpf_package(&config, &metadata.target_directory, root_package);
build_bpf_package(&config, &metadata.target_directory.as_ref(), root_package);
return;
}
}
@ -574,7 +570,7 @@ fn build_bpf(config: Config, manifest_path: Option<PathBuf>) {
.collect::<Vec<_>>();
for package in all_bpf_packages {
build_bpf_package(&config, &metadata.target_directory, package);
build_bpf_package(&config, &metadata.target_directory.as_ref(), package);
}
}