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

feat: Add more variables for template (#1160)

Browse source 
Fixed #775

 - Add dep target-lexicon v0.12.7
 - Add `target-{family, arch, libc, vendor}` to
   `package.metadata.binstall`.

For `{universal, universal2}-apple-darwin`, the `target-arch` is set to
`universal`.

Signed-off-by: Jiahao XU <Jiahao_XU@outlook.com>
This commit is contained in:
Jiahao XU 2023-06-21 08:05:13 +10:00 • committed by GitHub
parent 181b5293e7
commit d8419ea5a2
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
10 changed files with 210 additions and 115 deletions
Download patch file Download diff file Expand all files Collapse all files

16
crates/binstalk/src/errors.rs
View file

@ -10,6 +10,7 @@ use binstalk_downloader::{
use cargo_toml::Error as CargoTomlError;
use compact_str::CompactString;
use miette::{Diagnostic, Report};
use target_lexicon::ParseError as TargetTripleParseError;
use thiserror::Error;
use tokio::task;
use tracing::{error, warn};
@ -314,6 +315,14 @@ pub enum BinstallError {
#[diagnostic(severity(error), code(binstall::gh_api_failure))]
GhApiErr(#[source] Box<GhApiError>),
/// Failed to parse target triple
///
/// - Code: `binstall::target_triple_parse_error`
/// - Exit: 97
#[error("Failed to parse target triple: {0}")]
#[diagnostic(severity(error), code(binstall::target_triple_parse_error))]
TargetTripleParseError(#[source] Box<TargetTripleParseError>),
/// A wrapped error providing the context of which crate the error is about.
#[error(transparent)]
#[diagnostic(transparent)]
@ -348,6 +357,7 @@ impl BinstallError {
NoFallbackToCargoInstall => 94,
InvalidPkgFmt(..) => 95,
GhApiErr(..) => 96,
TargetTripleParseError(..) => 97,
CrateContext(context) => context.err.exit_number(),
};
@ -441,3 +451,9 @@ impl From<GhApiError> for BinstallError {
BinstallError::GhApiErr(Box::new(e))
}
}
impl From<target_lexicon::ParseError> for BinstallError {
fn from(e: target_lexicon::ParseError) -> Self {
BinstallError::TargetTripleParseError(Box::new(e))
}
}