Switch to vergen-gitcl

Author: bgw

Cargo.lock

@@ -426,8 +426,8 @@ unicode-segmentation = "1.10.1"
 unsize = "1.1.0"
 url = "2.2.2"
 urlencoding = "2.1.2"
-vergen = { version = "9.0.4", features = ["cargo"] }
-vergen-git2 = { version = "1.0.5", features = ["cargo"] }
+vergen = { git = "https://github.com/bgw/vergen.git", branch = "bgw/no-optional-locks", features = ["cargo"] }
+vergen-gitcl = { git = "https://github.com/bgw/vergen.git", branch = "bgw/no-optional-locks", features = ["cargo"] }
 webbrowser = "0.8.7"
 
 [patch.crates-io]

Cargo.toml

@@ -142,7 +142,7 @@ anyhow = { workspace = true }
 napi-build = "2"
 serde = { workspace = true }
 serde_json = { workspace = true }
-vergen-git2 = { workspace = true }
+vergen-gitcl = { workspace = true }
 
 # build-dependencies for the native, non-wasm32 build
 [target.'cfg(not(target_arch = "wasm32"))'.build-dependencies]

crates/napi/Cargo.toml

@@ -9,7 +9,7 @@ fn main() -> anyhow::Result<()> {
     // Generates, stores build-time information as static values.
     // There are some places relying on correct values for this (i.e telemetry),
     // So failing build if this fails.
-    let cargo = vergen_git2::CargoBuilder::default()
+    let cargo = vergen_gitcl::CargoBuilder::default()
         .target_triple(true)
         .build()?;
     // We use the git dirty state to disable persistent caching (persistent caching relies on a
@@ -27,15 +27,15 @@ fn main() -> anyhow::Result<()> {
     // top-level crate has changed (which would've triggered our rebuild), then the resulting binary
     // must be equivalent to a clean build anyways. Therefore, persistent caching using the HEAD
     // commit hash as a version is okay.
-    let git = vergen_git2::Git2Builder::default()
+    let git = vergen_gitcl::GitclBuilder::default()
         .dirty(/* include_untracked */ true)
         .describe(
             /* tags */ true,
             /* dirty */ !is_ci, // suppress the dirty suffix in CI
             /* matches */ Some("v[0-9]*"), // find the last version tag
         )
         .build()?;
-    vergen_git2::Emitter::default()
+    vergen_gitcl::Emitter::default()
         .add_instructions(&cargo)?
         .add_instructions(&git)?
         .fail_on_error()

crates/napi/build.rs

@@ -7,7 +7,7 @@ use std::{
 
 use anyhow::Result;
 
-/// Information gathered by `vergen_git2` in the top-level binary crate and passed down. This
+/// Information gathered by `vergen_gitcl` in the top-level binary crate and passed down. This
 /// information must be computed in the top-level crate for cargo incremental compilation to work
 /// correctly.
 ///