actions/cargo-binstall
1
0
Fork 0
mirror of https://github.com/cargo-bins/cargo-binstall.git synced 2025-06-15 15:16:37 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix Cargo.toml disabled strategy checking for compile strategy

Browse source 
Signed-off-by: Jiahao XU <Jiahao_XU@outlook.com>
This commit is contained in:
Jiahao XU 2024-07-23 00:21:49 +10:00
parent b004360576
commit 898796b91d
No known key found for this signature in database
GPG key ID: 76D1E687CA3C4928
1 changed files with 27 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

35
crates/binstalk/src/ops/resolve.rs
View file

@ -8,7 +8,10 @@ use std::{
};
use binstalk_fetchers::FETCHER_GH_CRATE_META;
use binstalk_types::crate_info::{CrateSource, SourceType};
use binstalk_types::{
cargo_toml_binstall::Strategy,
crate_info::{CrateSource, SourceType},
};
use compact_str::{CompactString, ToCompactString};
use itertools::Itertools;
use leon::Template;
@ -240,14 +243,30 @@ async fn resolve_inner(
}
}
if opts.cargo_install_fallback {
Ok(Resolution::InstallFromSource(ResolutionSource {
name: package_info.name,
version: package_info.version_str,
}))
} else {
Err(BinstallError::NoFallbackToCargoInstall)
if !opts.cargo_install_fallback {
return Err(BinstallError::NoFallbackToCargoInstall);
}
let target_meta = if let Some((_, target)) = desired_targets.get(0) {
package_info.meta.merge_overrides(
iter::once(&opts.cli_overrides).chain(package_info.overrides.get(*target)),
)
} else {
package_info
.meta
.merge_overrides(iter::once(&opts.cli_overrides))
};
if let Some(disabled_strategies) = target_meta.disabled_strategies.as_deref() {
if disabled_strategies.contains(&Strategy::Compile) {
return Err(BinstallError::NoFallbackToCargoInstall);
}
}
return Ok(Resolution::InstallFromSource(ResolutionSource {
name: package_info.name,
version: package_info.version_str,
}));
}
/// * `fetcher` - `fetcher.find()` must have returned `Ok(true)`.