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

fix(resolve): prefer official binaries (#1741)

Browse source 
* prefer official binaries with secondary targets over quickinstall binaries

* chore(test): add jj-cli to live e2e test
This commit is contained in:
Remo Senekowitsch 2024-06-13 10:26:30 +02:00 • committed by GitHub
parent 38f8eb4b1a
commit 250814f530
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 11 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -101,9 +101,9 @@ async fn resolve_inner(
)); ));
handles.extend( handles.extend(
desired_targets resolvers
.into_iter() .iter()
.map(|(triple, target)| { .cartesian_product(desired_targets.into_iter().map(|(triple, target)| {
debug!("Building metadata for target: {target}"); debug!("Building metadata for target: {target}");
let target_meta = package_info.meta.merge_overrides( let target_meta = package_info.meta.merge_overrides(
@ -117,9 +117,8 @@ async fn resolve_inner(
meta: target_meta, meta: target_meta,
target_related_info: triple, target_related_info: triple,
}) })
}) }))
.cartesian_product(resolvers) .map(|(f, target_data)| {
.map(|(target_data, f)| {
let fetcher = f( let fetcher = f(
opts.client.clone(), opts.client.clone(),
opts.gh_api_client.clone(), opts.gh_api_client.clone(),

7
e2e-tests/live.sh
View file

@ -8,7 +8,7 @@ unset CARGO_INSTALL_ROOT
# to find versions matching <= 1.3.3 # to find versions matching <= 1.3.3
# - `cargo-quickinstall` would test `fetch_crate_cratesio_version_matched` ability # - `cargo-quickinstall` would test `fetch_crate_cratesio_version_matched` ability
# to find latest stable version. # to find latest stable version.
crates="b3sum@<=1.3.3 cargo-release@0.24.9 cargo-binstall@0.20.1 cargo-watch@8.4.0 miniserve@0.23.0 sccache@0.3.3 cargo-quickinstall" crates="b3sum@<=1.3.3 cargo-release@0.24.9 cargo-binstall@0.20.1 cargo-watch@8.4.0 miniserve@0.23.0 sccache@0.3.3 cargo-quickinstall jj-cli@0.18.0"
CARGO_HOME=$(mktemp -d 2>/dev/null || mktemp -d -t 'cargo-home') CARGO_HOME=$(mktemp -d 2>/dev/null || mktemp -d -t 'cargo-home')
export CARGO_HOME export CARGO_HOME
@ -54,3 +54,8 @@ echo "$miniserve_version"
[ "$miniserve_version" = "miniserve 0.23.0" ] [ "$miniserve_version" = "miniserve 0.23.0" ]
cargo-quickinstall -V cargo-quickinstall -V
jj_version="$(jj --version)"
echo "$jj_version"
[ "$jj_version" = "jj 0.18.0-9fb5307b7886e390c02817af7c31b403f0279144" ]