move to latest vergen

Author: jgallagher

Cargo.lock

@@ -767,7 +767,7 @@ url = "2.5.4"
 usdt = "0.5.0"
 uuid = { version = "1.17.0", features = ["serde", "v4"] }
 uzers = "0.12"
-vergen = { version = "8.3.2", features = ["git", "git2"] }
+vergen-gitcl = { version = "1.0.8" }
 walkdir = "2.5"
 whoami = "1.5"
 wicket = { path = "wicket" }

Cargo.toml

@@ -9,7 +9,7 @@ workspace = true
 
 [build-dependencies]
 omicron-rpaths.workspace = true
-vergen.workspace = true
+vergen-gitcl.workspace = true
 
 [dependencies]
 anyhow.workspace = true

dev-tools/omdb/Cargo.toml

@@ -2,15 +2,25 @@
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
-use vergen::EmitBuilder;
+use vergen_gitcl::Emitter;
+use vergen_gitcl::GitclBuilder;
 
 fn main() {
     // See omicron-rpaths for documentation. NOTE: This file MUST be kept in
     // sync with the other build.rs files in this repository.
     omicron_rpaths::configure_default_omicron_rpaths();
 
-    EmitBuilder::builder()
-        .all_git()
+    // Define the `VERGEN_GIT_SHA` and `VERGEN_GIT_DIRTY` environment variables
+    // (accessible via `env!()`) that note the current git commit and whether
+    // the working tree is dirty at the time of this build.
+    let gitcl = GitclBuilder::default()
+        .sha(/* short= */ false)
+        .dirty(/* include_untracked= */ false)
+        .build()
+        .expect("valid GitclBuilder configuration");
+    Emitter::default()
+        .add_instructions(&gitcl)
+        .expect("valid instructions")
         .emit()
-        .expect("failed to write vergen info");
+        .expect("emitted version information");
 }

dev-tools/omdb/build.rs

@@ -9,7 +9,7 @@ workspace = true
 
 [build-dependencies]
 omicron-rpaths.workspace = true
-vergen.workspace = true
+vergen-gitcl.workspace = true
 
 [dependencies]
 anyhow.workspace = true

nexus/db-model/Cargo.toml

@@ -2,15 +2,25 @@
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
-use vergen::EmitBuilder;
+use vergen_gitcl::Emitter;
+use vergen_gitcl::GitclBuilder;
 
 fn main() {
     // See omicron-rpaths for documentation. NOTE: This file MUST be kept in
     // sync with the other build.rs files in this repository.
     omicron_rpaths::configure_default_omicron_rpaths();
 
-    EmitBuilder::builder()
-        .all_git()
+    // Define the `VERGEN_GIT_SHA` and `VERGEN_GIT_DIRTY` environment variables
+    // (accessible via `env!()`) that note the current git commit and whether
+    // the working tree is dirty at the time of this build.
+    let gitcl = GitclBuilder::default()
+        .sha(/* short= */ false)
+        .dirty(/* include_untracked= */ false)
+        .build()
+        .expect("valid GitclBuilder configuration");
+    Emitter::default()
+        .add_instructions(&gitcl)
+        .expect("valid instructions")
         .emit()
-        .expect("failed to write vergen info");
+        .expect("emitted version information");
 }

nexus/db-model/build.rs

@@ -129,7 +129,7 @@ strum-754bda37e0fb3874 = { package = "strum", version = "0.27.2", features = ["d
 subtle = { version = "2.6.1" }
 syn-f595c2ba2a3f28df = { package = "syn", version = "2.0.106", features = ["extra-traits", "fold", "full", "visit", "visit-mut"] }
 thiserror = { version = "2.0.16" }
-time = { version = "0.3.36", features = ["formatting", "local-offset", "macros", "parsing"] }
+time = { version = "0.3.43", features = ["formatting", "local-offset", "macros", "parsing"] }
 tokio = { version = "1.47.0", features = ["full", "test-util"] }
 tokio-postgres = { version = "0.7.13", features = ["with-chrono-0_4", "with-serde_json-1", "with-uuid-1"] }
 tokio-rustls = { version = "0.26.0", default-features = false, features = ["logging", "ring", "tls12"] }
@@ -266,8 +266,8 @@ subtle = { version = "2.6.1" }
 syn-dff4ba8e3ae991db = { package = "syn", version = "1.0.109", features = ["extra-traits", "fold", "full", "visit"] }
 syn-f595c2ba2a3f28df = { package = "syn", version = "2.0.106", features = ["extra-traits", "fold", "full", "visit", "visit-mut"] }
 thiserror = { version = "2.0.16" }
-time = { version = "0.3.36", features = ["formatting", "local-offset", "macros", "parsing"] }
-time-macros = { version = "0.2.18", default-features = false, features = ["formatting", "parsing"] }
+time = { version = "0.3.43", features = ["formatting", "local-offset", "macros", "parsing"] }
+time-macros = { version = "0.2.24", default-features = false, features = ["formatting", "parsing"] }
 tokio = { version = "1.47.0", features = ["full", "test-util"] }
 tokio-postgres = { version = "0.7.13", features = ["with-chrono-0_4", "with-serde_json-1", "with-uuid-1"] }
 tokio-rustls = { version = "0.26.0", default-features = false, features = ["logging", "ring", "tls12"] }
@@ -282,7 +282,6 @@ url = { version = "2.5.4", features = ["serde"] }
 usdt = { version = "0.5.0" }
 usdt-impl = { version = "0.5.0", default-features = false, features = ["asm", "des"] }
 uuid = { version = "1.18.1", features = ["serde", "v4"] }
-vergen = { version = "8.3.2", features = ["cargo", "git", "git2", "rustc"] }
 winnow-ca01ad9e24f5d932 = { package = "winnow", version = "0.7.10" }
 x509-cert = { version = "0.2.5" }
 zerocopy-c38e5c1d305a1b54 = { package = "zerocopy", version = "0.8.26", default-features = false, features = ["derive", "simd"] }