Use short version string for --version flag in cli and launcher

Author: gregmagolan

crates/aspect-cli/src/main.rs

@@ -8,7 +8,7 @@ use std::env::var;
 use std::path::PathBuf;
 use std::process::ExitCode;
 
-use aspect_telemetry::{cargo_pkg_version, do_not_track, send_telemetry};
+use aspect_telemetry::{cargo_pkg_short_version, cargo_pkg_version, do_not_track, send_telemetry};
 use axl_runtime::engine::task::{FrozenTask, Task};
 use axl_runtime::engine::task_arg::TaskArg;
 use axl_runtime::engine::task_args::TaskArgs;
@@ -239,7 +239,7 @@ async fn main() -> miette::Result<ExitCode> {
             // customize the usage string to use <TASK>
             .subcommand_value_name("TASK")
             // handle --version and -v flags
-            .version(cargo_pkg_version())
+            .version(cargo_pkg_short_version())
             .disable_version_flag(true) // disable auto -V / --version
             .arg(
                 Arg::new("version")

crates/aspect-launcher/src/config.rs

@@ -2,7 +2,7 @@ use std::env::current_dir;
 use std::path::{Path, PathBuf};
 use std::{collections::HashMap, fmt::Debug, fs};
 
-use aspect_telemetry::cargo_pkg_version;
+use aspect_telemetry::cargo_pkg_short_version;
 use serde::Deserialize;
 
 const AXL_MODULE_FILE: &str = "MODULE.aspect";
@@ -33,7 +33,7 @@ fn default_cli_sources() -> Vec<ToolSource> {
 pub struct CliConfig {
     #[serde(default = "default_cli_sources")]
     sources: Vec<ToolSource>,
-    #[serde(default = "cargo_pkg_version")]
+    #[serde(default = "cargo_pkg_short_version")]
     version: String,
 }
 

crates/aspect-launcher/src/main.rs

@@ -13,7 +13,8 @@ use std::process::ExitCode;
 use std::str::FromStr;
 
 use aspect_telemetry::{
-    cargo_pkg_version, do_not_track, send_telemetry, BZLARCH, BZLOS, GOARCH, GOOS, LLVM_TRIPLE,
+    cargo_pkg_short_version, do_not_track, send_telemetry, BZLARCH, BZLOS, GOARCH, GOOS,
+    LLVM_TRIPLE,
 };
 use clap::{arg, Arg, Command};
 use fork::{fork, Fork};
@@ -301,8 +302,8 @@ fn main() -> Result<ExitCode> {
     let matches = cmd.get_matches();
 
     if matches.get_flag("version") {
-        let v = cargo_pkg_version();
-        println!("Aspect CLI Launcher {v:}");
+        let v = cargo_pkg_short_version();
+        println!("aspect launcher {v:}");
         return Ok(ExitCode::SUCCESS);
     }
 

crates/aspect-telemetry/src/lib.rs

@@ -31,6 +31,16 @@ pub fn cargo_pkg_version() -> String {
         .into()
 }
 
+/// A short variant of the monorepo version. For examples, 2025.34.0 if the monorepo
+/// version was 2025.34.0+201b9a8. See https://blog.aspect.build/versioning-releases-from-a-monorepo.
+pub fn cargo_pkg_short_version() -> String {
+    let s = cargo_pkg_version();
+    match s.find('+') {
+        Some(i) => s[..i].to_string(),
+        None => s,
+    }
+}
+
 pub fn do_not_track() -> bool {
     var("DO_NOT_TRACK").is_ok()
 }