change(githash): provide date and hash

client/src/lib.rs

@@ -79,9 +79,11 @@ impl Client {
                 // TODO: Voxygen should display this.
                 if server_info.git_hash != common::util::GIT_HASH.to_string() {
                     log::warn!(
-                        "Git hash mismatch between client and server: {} vs {}",
+                        "Server is running {}[{}], you are running {}[{}], versions might be incompatible!",
                         server_info.git_hash,
-                        common::util::GIT_HASH
+                        server_info.git_date,
+                        common::util::GIT_HASH,
+                        common::util::GIT_DATE,
                     );
                 }
 

common/build.rs

@@ -9,7 +9,13 @@ use std::process::Command;
 fn main() {
     // Get the current githash
     match Command::new("git")
-        .args(&["rev-parse", "--short", "HEAD"])
+        .args(&[
+            "log",
+            "-n",
+            "1",
+            "--pretty=format:%h %cd",
+            "--date=format:%Y-%m-%d-%H:%M",
+        ])
         .output()
     {
         Ok(output) => match String::from_utf8(output.stdout) {

common/src/msg/server.rs

@@ -20,6 +20,7 @@ pub struct ServerInfo {
     pub name: String,
     pub description: String,
     pub git_hash: String,
+    pub git_date: String,
 }
 
 #[derive(Debug, Clone, Serialize, Deserialize)]

common/src/util/mod.rs

@@ -1,4 +1,21 @@
-pub const GIT_HASH: &str = include_str!(concat!(env!("OUT_DIR"), "/githash"));
+pub const GIT_VERSION: &str = include_str!(concat!(env!("OUT_DIR"), "/githash"));
+
+lazy_static::lazy_static! {
+    pub static ref GIT_HASH: &'static str = include_str!(concat!(env!("OUT_DIR"), "/githash")).split(" ").nth(0).unwrap();
+    pub static ref GIT_DATE: &'static str = include_str!(concat!(env!("OUT_DIR"), "/githash")).split(" ").nth(1).unwrap();
+}
+
+impl std::fmt::Display for GIT_HASH {
+    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+        write!(f, "{}", self.to_string())
+    }
+}
+
+impl std::fmt::Display for GIT_DATE {
+    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+        write!(f, "{}", self.to_string())
+    }
+}
 
 use vek::{Mat3, Rgb, Rgba, Vec3};
 

server/src/lib.rs

@@ -124,6 +124,7 @@ impl Server {
                 name: settings.server_name.clone(),
                 description: settings.server_description.clone(),
                 git_hash: common::util::GIT_HASH.to_string(),
+                git_date: common::util::GIT_DATE.to_string(),
             },
             metrics: ServerMetrics::new(settings.metrics_address),
             accounts: AuthProvider::new(),

server/src/metrics.rs

@@ -40,7 +40,7 @@ impl ServerMetrics {
         );
         let entity_count = IntGauge::with_opts(opts).unwrap();
         let opts = Opts::new("veloren_build_info", "Build information")
-            .const_label("hash", common::util::GIT_HASH)
+            .const_label("hash", &common::util::GIT_HASH)
             .const_label("version", "");
         let build_info = IntGauge::with_opts(opts).unwrap();
         let opts = Opts::new(