Add git semver build version and add version field to admin /api/config.

Author: knadh

Makefile

@@ -1,12 +1,17 @@
 # Try to get the semver from 1) git 2) fallback.
-VERSION := $(or $(shell git describe --tags --abbrev=0 2> /dev/null),"v0.0.0")
+VERSION := $(or $(shell git describe --tags --abbrev=0 2> /dev/null),0.0.0)
+
 COMMIT := $(or $(shell git rev-parse --short HEAD 2> /dev/null),"unknown")
 
 BIN := dictpress
 
 .PHONY: build
 build:
-	cargo build --release
+	VERSION=$(VERSION) cargo build --release
+
+.PHONY: build-debug
+build-debug:
+	VERSION=$(VERSION) cargo build
 
 .PHONY: run
 run:

build.rs

@@ -0,0 +1,4 @@
+fn main() {
+    let version = std::env::var("VERSION").unwrap_or_else(|_| "v0.0.0".to_string());
+    println!("cargo:rustc-env=VERSION={}", version);
+}

src/cli.rs

@@ -5,7 +5,7 @@ use clap::{Parser, Subcommand};
 #[derive(Parser)]
 #[command(name = "dictpress")]
 #[command(about = "dictpress - Build dictionary websites. https://dict.press")]
-#[command(version)]
+#[command(version = env!("VERSION"))]
 pub struct Cli {
     /// Path to one or more config files (merged in order).
     #[arg(long, default_value = "config.toml", action = clap::ArgAction::Append)]

src/handlers/admin.rs

@@ -13,6 +13,7 @@ use crate::models::Stats;
 pub struct ConfigResp {
     pub languages: HashMap<String, LangResp>,
     pub dicts: Vec<[String; 2]>,
+    pub version: String,
 }
 
 #[derive(serde::Serialize)]
@@ -50,6 +51,7 @@ pub async fn get_config(State(ctx): State<Arc<Ctx>>) -> Result<ApiResp<ConfigRes
             .iter()
             .map(|(from, to)| [from.id.clone(), to.id.clone()])
             .collect(),
+        version: ctx.version.clone(),
     };
 
     Ok(json(out))

src/handlers/mod.rs

@@ -44,6 +44,7 @@ pub struct Ctx {
 
     pub consts: Consts,
     pub asset_ver: String,
+    pub version: String,
 }
 
 /// Application constants.

src/main.rs

@@ -312,6 +312,9 @@ async fn main() {
             "{:08}",
             chrono::Local::now().timestamp_nanos_opt().unwrap_or(0) % 100_000_000
         ),
+
+        // App build version.
+        version: env!("VERSION").to_string(),
     });
 
     // Start the HTTP server.