From 1b8fee265a7f906a5b0d06fe3f7543b7a7216a02 Mon Sep 17 00:00:00 2001 From: cloudhead Date: Mon, 25 Mar 2024 10:47:19 +0100 Subject: [PATCH] Implement new versioning system See `VERSIONING.md` for details. --- radicle-httpd/src/api.rs | 2 +- radicle-httpd/src/commands/web.rs | 2 +- radicle-httpd/src/main.rs | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/radicle-httpd/src/api.rs b/radicle-httpd/src/api.rs index a21da03d0..498b052b1 100644 --- a/radicle-httpd/src/api.rs +++ b/radicle-httpd/src/api.rs @@ -34,7 +34,7 @@ use crate::api::error::Error; use crate::cache::Cache; use crate::Options; -pub const VERSION: &str = env!("CARGO_PKG_VERSION"); +pub const VERSION: &str = env!("RADICLE_VERSION"); /// Identifier for sessions type SessionId = String; diff --git a/radicle-httpd/src/commands/web.rs b/radicle-httpd/src/commands/web.rs index c70c40c4c..3229ebf5a 100644 --- a/radicle-httpd/src/commands/web.rs +++ b/radicle-httpd/src/commands/web.rs @@ -16,7 +16,7 @@ use radicle_cli::terminal::args::{Args, Error, Help}; pub const HELP: Help = Help { name: "web", description: "Run the HTTP daemon and connect the web explorer to it", - version: env!("CARGO_PKG_VERSION"), + version: env!("RADICLE_VERSION"), usage: r#" Usage diff --git a/radicle-httpd/src/main.rs b/radicle-httpd/src/main.rs index 5a3304e4d..bf4f94890 100644 --- a/radicle-httpd/src/main.rs +++ b/radicle-httpd/src/main.rs @@ -10,7 +10,7 @@ async fn main() -> anyhow::Result<()> { // SAFETY: The logger is only initialized once. httpd::logger::init().unwrap(); - tracing::info!("version {}-{}", env!("CARGO_PKG_VERSION"), env!("GIT_HEAD")); + tracing::info!("version {}-{}", env!("RADICLE_VERSION"), env!("GIT_HEAD")); match httpd::run(options).await { Ok(()) => {}