feat: improve the --version output

Author: Mcdostone

.dockerignore

@@ -2,4 +2,5 @@
 !crates/
 !Cargo.toml
 !Cargo.lock
-.env
+.env
+!.git/**

.github/workflows/build.yml

@@ -24,25 +24,31 @@ concurrency:
 jobs:
 
   check:
-    name: Check ${{ matrix.package }}
+    name: Check ${{ matrix.package.name }}
     runs-on: ubuntu-latest
     strategy:
       matrix:
         package:
-          - "yozefu-lib"
-          - "yozefu-app"
-          - "yozefu-command"
-          - "yozefu-tui"
-          - "yozefu-wasm-types"
-          - "yozefu"
+          - name: yozefu-lib
+            command: cargo check --locked --package yozefu-lib
+          - name: yozefu-app
+            command: cargo check --locked --package yozefu-app
+          - name: yozefu-command
+            command: cargo check --locked --package yozefu-command
+          - name: yozefu-tui
+            command: cargo check --locked --package yozefu-tui
+          - name: yozefu-wasm-types
+            command: cargo check --locked --package yozefu-wasm-types
+          - name: yozefu
+            command: cargo run --locked -- --version
     steps:
     - uses: actions/checkout@v4
     - uses: actions-rust-lang/setup-rust-toolchain@v1
       with:
         toolchain: stable
     - uses: Swatinem/rust-cache@v2
     - name: Run cargo check
-      run: cargo check --locked --release --package ${{ matrix.package }}
+      run: ${{ matrix.package.command }}
 
   build:
     name: Build w/o features
@@ -193,7 +199,7 @@ jobs:
   docker:
     name: Docker image
     runs-on: ubuntu-latest
-    needs: [check]
+    # needs: [check]
     permissions:
         contents: read
         packages: write
@@ -204,10 +210,13 @@ jobs:
       uses: actions/checkout@v4
     - name: Set up Docker Buildx
       uses: docker/setup-buildx-action@v3
-    - name: Build and push
+    - name: Build
       uses: docker/build-push-action@v6
-      id: push
       with:
+        context: .
+        build-args: |
+          GITHUB_REF_NAME=$GITHUB_REF_NAME 
+          GITHUB_SHA=$GITHUB_SHA
         push: false
         cache-from: type=gha
         cache-to: type=gha,mode=max

.github/workflows/publish.yml

@@ -199,6 +199,7 @@ jobs:
       uses: docker/build-push-action@v6
       id: push
       with:
+        context: .
         push: true
         tags: ${{ steps.meta.outputs.tags }}
         cache-from: type=gha

Cargo.lock

@@ -3,11 +3,13 @@ WORKDIR /app
 RUN --mount=type=bind,source=crates,target=crates \
     --mount=type=bind,source=Cargo.toml,target=Cargo.toml \
     --mount=type=bind,source=Cargo.lock,target=Cargo.lock \
+    --mount=type=bind,source=.git,target=.git \
     --mount=type=cache,target=/app/target/ \
     --mount=type=cache,target=/usr/local/cargo/registry/ \
     <<EOF
 set -e
 apt-get update && apt-get install --no-install-recommends -y build-essential cmake libclang-dev
+ls -lah
 cargo build --release --all-features --locked
 cp ./target/release/yozf /tmp/yozf
 EOF
@@ -31,6 +33,7 @@ ln -fs "/bin/app" /usr/local/bin/yozefu
 ln -fs "/bin/app" /usr/bin/yozf
 ln -fs "/bin/app" /usr/local/bin/yozefu
 EOF
+RUN /bin/app --version
 
 USER yozefu
 WORKDIR /home/yozefu

Dockerfile

@@ -40,23 +40,21 @@ rdkafka = { version = "0.37.0", features = [
     "libz-static",
     "curl-static",
     "zstd",
-    "external-lz4"
+    "external-lz4",
 ] }
 extism = { version = "1.10.0" }
 indexmap = "2.8.0"
 tui = { workspace = true }
 app = { workspace = true }
 lib = { workspace = true }
 reqwest = { version = "0.12.15", features = ["json"] }
+const_format = { version = "0.2.34", features = ["rust_1_64"] }
+const-str = "0.6.2"
 
 [features]
-ssl-vendored = [
-    "rdkafka/ssl-vendored",
-    "tui/ssl-vendored",
-    "app/ssl-vendored"
-]
+ssl-vendored = ["rdkafka/ssl-vendored", "tui/ssl-vendored", "app/ssl-vendored"]
 gssapi-vendored = [
     "rdkafka/gssapi-vendored",
     "tui/gssapi-vendored",
-    "app/gssapi-vendored"
+    "app/gssapi-vendored",
 ]

crates/command/Cargo.toml

@@ -2,6 +2,7 @@
 use crate::cluster::Cluster;
 use crate::command::{Command, MainCommand, UtilityCommands};
 use crate::theme::init_themes_file;
+use crate::version::VERSION_MESSAGE;
 use app::APPLICATION_NAME;
 use app::configuration::{ClusterConfig, GlobalConfig, SchemaRegistryConfig, YozefuConfig};
 use clap::command;
@@ -14,14 +15,6 @@ use tui::error::TuiError;
 pub use clap::Parser;
 use indexmap::IndexMap;
 
-const VERSION_MESSAGE: &str = concat!(
-    env!("CARGO_PKG_VERSION"),
-    "\n",
-    env!("CARGO_PKG_REPOSITORY"),
-    "\n",
-    env!("CARGO_PKG_AUTHORS")
-);
-
 // https://github.com/clap-rs/clap/issues/975
 /// CLI parser
 #[derive(Parser)]

crates/command/src/cli.rs

@@ -7,6 +7,7 @@ mod command;
 mod headless;
 mod log;
 mod theme;
+mod version;
 use app::configuration::GlobalConfig;
 pub use clap::Parser;
 pub use cli::Cli;

crates/command/src/lib.rs

@@ -0,0 +1,43 @@
+//! Inspired of <https://vallentin.dev/blog/post/versioning>
+//!
+//! Github environment variables <https://docs.github.com/en/actions/writing-workflows/choosing-what-your-workflow-does/store-information-in-variables>
+//! The version message looks like this:
+//! ```
+//! yozefu 0.0.9 (develop:13aedf2, debug build, macos [aarch64])
+//! https://github.com/MAIF/yozefu
+//! Yann Prono <[email protected]>
+//! ```
+use const_format::{formatcp, str_index, str_split};
+use const_str::split_lines;
+use std::env::consts::{ARCH, OS};
+
+#[cfg(debug_assertions)]
+const BUILD_TYPE: &str = "debug";
+
+#[cfg(not(debug_assertions))]
+const BUILD_TYPE: &'static str = "release";
+
+const GIT_BRANCH: &str = match option_env!("GITHUB_REF_NAME") {
+    Some(v) => v,
+    None => {
+        const FIRST_LINE: &str = split_lines!(include_str!("../../../.git/HEAD"))[0];
+        str_split!(FIRST_LINE, "/")[2]
+    }
+};
+
+const GIT_COMMIT: &str = match option_env!("GITHUB_SHA") {
+    Some(v) => v,
+    None => "unknown",
+};
+
+pub(super) const VERSION_MESSAGE: &str = formatcp!(
+    "{} ({}:{}, {} build, {} [{}]) \n{}\n{}",
+    env!("CARGO_PKG_VERSION"),
+    GIT_BRANCH,
+    str_index!(GIT_COMMIT, 0..7),
+    BUILD_TYPE,
+    OS,
+    ARCH,
+    env!("CARGO_PKG_REPOSITORY"),
+    env!("CARGO_PKG_AUTHORS"),
+);

crates/command/src/version.rs

@@ -110,6 +110,10 @@ exceptions = [
     { allow = ["BSL-1.0"], crate = "lazy-bytes-cast" },
     { allow = ["Zlib"], crate = "throbber-widgets-tui" },
     { allow = ["Zlib"], crate = "adler32" },
+    { allow = ["Zlib"], crate = "const_format" },
+    { allow = ["Zlib"], crate = "konst_macro_rules" },
+    { allow = ["Zlib"], crate = "const_format_proc_macros" },
+    { allow = ["Zlib"], crate = "konst" }
 ]
 
 # Some crates don't have (easily) machine readable licensing information,