actions/cargo-binstall
1
0
Fork 0
mirror of https://github.com/cargo-bins/cargo-binstall.git synced 2025-05-07 20:50:03 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #161 from NobodyXu/feature/bin-multi-targets

Browse source
This commit is contained in:
Félix Saparelli 2022-06-07 23:55:05 +12:00 • committed by GitHub
commit 6877a0c3a9
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 30 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

26
src/main.rs
View file

@ -225,18 +225,24 @@ async fn entry() -> Result<()> {
.join(format!("pkg-{}.{}", opts.name, meta.pkg_fmt));
debug!("Using temporary download path: {}", pkg_path.display());
let fetcher_data = Data {
name: package.name.clone(),
target: opts.target.clone(),
version: package.version.clone(),
repo: package.repository.clone(),
meta: meta.clone(),
};
let fetcher_data: Vec<_> = detect_targets()
.await
.into_iter()
.map(|target| Data {
name: package.name.clone(),
target: target.into(),
version: package.version.clone(),
repo: package.repository.clone(),
meta: meta.clone(),
})
.collect();
// Try github releases, then quickinstall
let mut fetchers = MultiFetcher::default();
fetchers.add(GhCrateMeta::new(&fetcher_data).await);
fetchers.add(QuickInstall::new(&fetcher_data).await);
for data in &fetcher_data {
fetchers.add(GhCrateMeta::new(data).await);
fetchers.add(QuickInstall::new(data).await);
}
match fetchers.first_available().await {
Some(fetcher) => {
@ -343,7 +349,7 @@ async fn install_from_package(
// based on those found via Cargo.toml
let bin_data = bins::Data {
name: package.name.clone(),
target: opts.target.clone(),
target: fetcher.target().to_string(),
version: package.version.clone(),
repo: package.repository.clone(),
meta,