mirror/youki
1
0
Fork 0
mirror of https://github.com/containers/youki synced 2024-11-23 01:11:58 +01:00
Code Issues

Merge pull request #2813 from lengrongfu/fix/move-youki_version

Browse Source 
RustRover fix: macro define youki_version to use before
This commit is contained in:
Yashodhan 2024-06-14 17:24:41 +05:30 committed by GitHub
commit b6d210e0d9
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
crates/youki/src/main.rs
View File

@ -23,6 +23,23 @@ struct YoukiExtendOpts {
pub log_level: Option<String>, pub log_level: Option<String>,
} }
/// output Youki version in Moby compatible format
#[macro_export]
macro_rules! youki_version {
// For compatibility with Moby, match format here:
// https://github.com/moby/moby/blob/65cc84abc522a564699bb171ca54ea1857256d10/daemon/info_unix.go#L280
() => {
concat!(
"version ",
crate_version!(),
"\ncommit: ",
crate_version!(),
"-0-",
env!("VERGEN_GIT_SHA")
)
};
}
// High-level commandline option definition // High-level commandline option definition
// This takes global options as well as individual commands as specified in [OCI runtime-spec](https://github.com/opencontainers/runtime-spec/blob/master/runtime.md) // This takes global options as well as individual commands as specified in [OCI runtime-spec](https://github.com/opencontainers/runtime-spec/blob/master/runtime.md)
// Also check [runc commandline documentation](https://github.com/opencontainers/runc/blob/master/man/runc.8.md) for more explanation // Also check [runc commandline documentation](https://github.com/opencontainers/runc/blob/master/man/runc.8.md) for more explanation
@ -54,23 +71,6 @@ enum SubCommand {
Completion(commands::completion::Completion), Completion(commands::completion::Completion),
} }
/// output Youki version in Moby compatible format
#[macro_export]
macro_rules! youki_version {
// For compatibility with Moby, match format here:
// https://github.com/moby/moby/blob/65cc84abc522a564699bb171ca54ea1857256d10/daemon/info_unix.go#L280
() => {
concat!(
"version ",
crate_version!(),
"\ncommit: ",
crate_version!(),
"-0-",
env!("VERGEN_GIT_SHA")
)
};
}
/// This is the entry point in the container runtime. The binary is run by a high-level container runtime, /// This is the entry point in the container runtime. The binary is run by a high-level container runtime,
/// with various flags passed. This parses the flags, creates and manages appropriate resources. /// with various flags passed. This parses the flags, creates and manages appropriate resources.
fn main() -> Result<()> { fn main() -> Result<()> {
@ -89,7 +89,7 @@ fn main() -> Result<()> {
let opts = Opts::parse(); let opts = Opts::parse();
let mut app = Opts::command(); let mut app = Opts::command();
crate::observability::init(&opts).map_err(|err| { observability::init(&opts).map_err(|err| {
eprintln!("failed to initialize observability: {}", err); eprintln!("failed to initialize observability: {}", err);
err err
})?; })?;