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

Fix QuickInstall report bug for target universal2-apple-darwin (#921)

Browse source 
This bug was reintroduced by #919 and it was fixed by #918

Signed-off-by: Jiahao XU <Jiahao_XU@outlook.com>
This commit is contained in:
Jiahao XU 2023-03-18 20:35:48 +11:00 • committed by GitHub
parent a6e52afaa0
commit f28c05b0ee
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
crates/binstalk/src/fetchers/quickinstall.rs
View file

@ -20,6 +20,10 @@ use super::{Data, TargetData};
const BASE_URL: &str = "https://github.com/cargo-bins/cargo-quickinstall/releases/download"; const BASE_URL: &str = "https://github.com/cargo-bins/cargo-quickinstall/releases/download";
const STATS_URL: &str = "https://warehouse-clerk-tmp.vercel.app/api/crate"; const STATS_URL: &str = "https://warehouse-clerk-tmp.vercel.app/api/crate";
fn is_universal_macos(target: &str) -> bool {
["universal-apple-darwin", "universal2-apple-darwin"].contains(&target)
}
pub struct QuickInstall { pub struct QuickInstall {
client: Client, client: Client,
gh_api_client: GhApiClient, gh_api_client: GhApiClient,
@ -63,7 +67,7 @@ impl super::Fetcher for QuickInstall {
fn find(self: Arc<Self>) -> AutoAbortJoinHandle<Result<bool, BinstallError>> { fn find(self: Arc<Self>) -> AutoAbortJoinHandle<Result<bool, BinstallError>> {
AutoAbortJoinHandle::spawn(async move { AutoAbortJoinHandle::spawn(async move {
if self.target_data.target == "universal-apple-darwin" { if is_universal_macos(&self.target_data.target) {
return Ok(false); return Ok(false);
} }
@ -79,12 +83,12 @@ impl super::Fetcher for QuickInstall {
fn report_to_upstream(self: Arc<Self>) { fn report_to_upstream(self: Arc<Self>) {
if cfg!(debug_assertions) { if cfg!(debug_assertions) {
debug!("Not sending quickinstall report in debug mode"); debug!("Not sending quickinstall report in debug mode");
} else if self.target_data.target == "universal-apple-darwin" { } else if is_universal_macos(&self.target_data.target) {
debug!( debug!(
r#"Not sending quickinstall report for universal-apple-darwin r#"Not sending quickinstall report for universal-apple-darwin
quickinstall does not support our homebrew target and universal2-apple-darwin.
universal-apple-darwin, it only supports targets supported by Quickinstall does not support these targets, it only supports targets supported
rust officially."#, by rust officially."#,
); );
} else { } else {
tokio::spawn(async move { tokio::spawn(async move {