Make git commit hash optional in landing page

spacebear21 · spacebear21 · commit 0a1198967b6d · 2026-03-11T15:00:45.000-04:00
Environments without git (e.g. Docker builds from tarballs)
previously displayed "unknown" as the commit hash. Now the
build script only sets GIT_COMMIT when git is available, and
the landing page gracefully omits the hash, showing only the
cargo package version.
diff --git a/payjoin-mailroom/build.rs b/payjoin-mailroom/build.rs
@@ -1,16 +1,16 @@
 use std::process::Command;
 
 fn main() {
-    // Emit the short git commit hash at build time.
-    let commit = Command::new("git")
+    // Emit the short git commit hash at build time when available.
+    if let Some(commit) = Command::new("git")
         .args(["rev-parse", "--short", "HEAD"])
         .output()
         .ok()
         .filter(|o| o.status.success())
         .map(|o| String::from_utf8_lossy(&o.stdout).trim().to_string())
-        .unwrap_or_else(|| "unknown".into());
-
-    println!("cargo:rustc-env=GIT_COMMIT={commit}");
+    {
+        println!("cargo:rustc-env=GIT_COMMIT={commit}");
+    }
 
     // Re-run if HEAD changes (new commit).
     println!("cargo:rerun-if-changed=../.git/HEAD");
diff --git a/payjoin-mailroom/src/directory.rs b/payjoin-mailroom/src/directory.rs
@@ -436,8 +436,11 @@ fn handle_peek<E: SendableError>(
 fn landing_page_html() -> String {
     const TEMPLATE: &str = include_str!("../static/index.html");
     const VERSION: &str = env!("CARGO_PKG_VERSION");
-    const COMMIT: &str = env!("GIT_COMMIT");
-    TEMPLATE.replace("{{VERSION}}", VERSION).replace("{{COMMIT}}", COMMIT)
+    let version_string = match option_env!("GIT_COMMIT") {
+        Some(commit) => format!("payjoin-mailroom-v{VERSION} @ {commit}"),
+        None => format!("payjoin-mailroom-v{VERSION}"),
+    };
+    TEMPLATE.replace("{{VERSION_STRING}}", &version_string)
 }
 
 async fn handle_directory_home_path() -> Result<Response<Body>, HandlerError> {
@@ -799,7 +802,6 @@ mod tests {
     #[test]
     fn landing_page_contains_version() {
         let html = landing_page_html();
-        assert!(!html.contains("{{VERSION}}"));
-        assert!(!html.contains("{{COMMIT}}"));
+        assert!(!html.contains("{{VERSION_STRING}}"));
     }
 }
diff --git a/payjoin-mailroom/static/index.html b/payjoin-mailroom/static/index.html
@@ -242,7 +242,7 @@ <h2>OHTTP Relay</h2>
     </main>
 
     <footer>
-      <span><code>payjoin-mailroom-v{{VERSION}} @ {{COMMIT}}</code></span>
+      <span><code>{{VERSION_STRING}}</code></span>
       <span
         >Copyright &copy;
         <script>
