mirror of
https://codeberg.org/Cyborus/forgejo-cli.git
synced 2025-03-14 05:05:55 +01:00
Merge pull request 'add version --verbose
' (#149) from verbose-version into main
Reviewed-on: https://codeberg.org/Cyborus/forgejo-cli/pulls/149
This commit is contained in:
commit
9db33e37e4
6 changed files with 32 additions and 1 deletions
|
@ -3,6 +3,8 @@ when:
|
||||||
steps:
|
steps:
|
||||||
compile-linux:
|
compile-linux:
|
||||||
image: rust:latest
|
image: rust:latest
|
||||||
|
environment:
|
||||||
|
BUILD_TYPE: "release ci"
|
||||||
commands:
|
commands:
|
||||||
- rustup target add x86_64-unknown-linux-gnu
|
- rustup target add x86_64-unknown-linux-gnu
|
||||||
- cargo build --target=x86_64-unknown-linux-gnu --release --features update-check
|
- cargo build --target=x86_64-unknown-linux-gnu --release --features update-check
|
||||||
|
@ -10,6 +12,8 @@ steps:
|
||||||
secrets: [ client_info_codeberg ]
|
secrets: [ client_info_codeberg ]
|
||||||
compile-windows:
|
compile-windows:
|
||||||
image: rust:latest
|
image: rust:latest
|
||||||
|
environment:
|
||||||
|
BUILD_TYPE: "release ci"
|
||||||
commands:
|
commands:
|
||||||
- rustup target add x86_64-pc-windows-gnu
|
- rustup target add x86_64-pc-windows-gnu
|
||||||
- apt update
|
- apt update
|
||||||
|
|
1
Cargo.lock
generated
1
Cargo.lock
generated
|
@ -603,6 +603,7 @@ version = "0.2.0"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"auth-git2",
|
"auth-git2",
|
||||||
"base64ct",
|
"base64ct",
|
||||||
|
"cfg-if",
|
||||||
"clap",
|
"clap",
|
||||||
"comrak",
|
"comrak",
|
||||||
"crossterm",
|
"crossterm",
|
||||||
|
|
|
@ -20,6 +20,7 @@ update-check = ["dep:semver"]
|
||||||
[dependencies]
|
[dependencies]
|
||||||
auth-git2 = "0.5.4"
|
auth-git2 = "0.5.4"
|
||||||
base64ct = { version = "1.6.0", features = ["std"] }
|
base64ct = { version = "1.6.0", features = ["std"] }
|
||||||
|
cfg-if = "1.0.0"
|
||||||
clap = { version = "4.5.11", features = ["derive"] }
|
clap = { version = "4.5.11", features = ["derive"] }
|
||||||
comrak = "0.26.0"
|
comrak = "0.26.0"
|
||||||
crossterm = "0.27.0"
|
crossterm = "0.27.0"
|
||||||
|
@ -42,3 +43,6 @@ tokio = { version = "1.39.1", features = ["full"] }
|
||||||
url = "2.5.2"
|
url = "2.5.2"
|
||||||
uuid = { version = "1.10.0", features = ["v4"] }
|
uuid = { version = "1.10.0", features = ["v4"] }
|
||||||
|
|
||||||
|
[build-dependencies]
|
||||||
|
git2 = "0.19.0"
|
||||||
|
|
||||||
|
|
6
build.rs
Normal file
6
build.rs
Normal file
|
@ -0,0 +1,6 @@
|
||||||
|
fn main() {
|
||||||
|
println!(
|
||||||
|
"cargo:rustc-env=BUILD_TARGET={}",
|
||||||
|
std::env::var("TARGET").unwrap()
|
||||||
|
);
|
||||||
|
}
|
|
@ -24,6 +24,10 @@
|
||||||
homepage = "https://codeberg.org/Cyborus/forgejo-cli/";
|
homepage = "https://codeberg.org/Cyborus/forgejo-cli/";
|
||||||
license = with licenses; [ asl20 /* or */ mit ];
|
license = with licenses; [ asl20 /* or */ mit ];
|
||||||
};
|
};
|
||||||
|
|
||||||
|
env = {
|
||||||
|
BUILD_TYPE = "flake";
|
||||||
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
packages.default = packages.forgejo-cli;
|
packages.default = packages.forgejo-cli;
|
||||||
|
|
|
@ -8,11 +8,23 @@ pub struct VersionCommand {
|
||||||
#[clap(long)]
|
#[clap(long)]
|
||||||
#[cfg(feature = "update-check")]
|
#[cfg(feature = "update-check")]
|
||||||
check: bool,
|
check: bool,
|
||||||
|
#[clap(short, long)]
|
||||||
|
verbose: bool,
|
||||||
}
|
}
|
||||||
|
|
||||||
|
const BUILD_TYPE: &str = match option_env!("BUILD_TYPE") {
|
||||||
|
Some(s) => s,
|
||||||
|
None => "from source",
|
||||||
|
};
|
||||||
|
|
||||||
impl VersionCommand {
|
impl VersionCommand {
|
||||||
pub async fn run(self) -> eyre::Result<()> {
|
pub async fn run(self) -> eyre::Result<()> {
|
||||||
println!("{}", env!("CARGO_PKG_VERSION"));
|
println!("{} v{}", env!("CARGO_BIN_NAME"), env!("CARGO_PKG_VERSION"));
|
||||||
|
if self.verbose {
|
||||||
|
println!("user agent: {}", crate::keys::USER_AGENT);
|
||||||
|
println!("build type: {BUILD_TYPE}");
|
||||||
|
println!(" target: {}", env!("BUILD_TARGET"));
|
||||||
|
}
|
||||||
#[cfg(feature = "update-check")]
|
#[cfg(feature = "update-check")]
|
||||||
self.update_msg().await?;
|
self.update_msg().await?;
|
||||||
Ok(())
|
Ok(())
|
||||||
|
|
Loading…
Add table
Reference in a new issue