From 37ee61e290315b5f94df14b99ca2895372965cfe Mon Sep 17 00:00:00 2001
From: Josh McKinney <joshka@users.noreply.github.com>
Date: Fri, 23 Aug 2024 12:04:14 -0700
Subject: [PATCH] Fix vergen to use gix

---
 Cargo.lock                     | 45 +++++++++++++++++++++++++++++++++-
 component-generated/Cargo.toml |  3 +--
 component-generated/build.rs   |  5 ++--
 component/template/Cargo.toml  |  3 +--
 component/template/build.rs    |  5 ++--
 5 files changed, 52 insertions(+), 9 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 6d5da52..9bce589 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -194,6 +194,38 @@ version = "1.6.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a12916984aab3fa6e39d655a33e09c0071eb36d6ab3aea5c2d78551f1df6d952"
 
+[[package]]
+name = "camino"
+version = "1.1.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8b96ec4966b5813e2c0507c1f86115c8c5abaadc3980879c3424042a02fd1ad3"
+dependencies = [
+ "serde",
+]
+
+[[package]]
+name = "cargo-platform"
+version = "0.1.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "24b1f0365a6c6bb4020cd05806fd0d33c44d38046b8bd7f0e40814b9763cabfc"
+dependencies = [
+ "serde",
+]
+
+[[package]]
+name = "cargo_metadata"
+version = "0.18.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2d886547e41f740c616ae73108f6eb70afe6d940c7bc697cb30f13daec073037"
+dependencies = [
+ "camino",
+ "cargo-platform",
+ "semver",
+ "serde",
+ "serde_json",
+ "thiserror",
+]
+
 [[package]]
 name = "cassowary"
 version = "0.3.0"
@@ -347,7 +379,6 @@ dependencies = [
  "tracing",
  "tracing-error",
  "tracing-subscriber",
- "vergen",
  "vergen-gix",
 ]
 
@@ -1986,6 +2017,15 @@ version = "1.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49"
 
+[[package]]
+name = "semver"
+version = "1.0.23"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "61697e0a1c7e512e84a621326239844a24d8207b4669b41bc18b32ea5cbf988b"
+dependencies = [
+ "serde",
+]
+
 [[package]]
 name = "serde"
 version = "1.0.208"
@@ -2558,7 +2598,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c32e7318e93a9ac53693b6caccfb05ff22e04a44c7cf8a279051f24c09da286f"
 dependencies = [
  "anyhow",
+ "cargo_metadata",
  "derive_builder",
+ "getset",
+ "regex",
  "rustversion",
  "time",
  "vergen-lib",
diff --git a/component-generated/Cargo.toml b/component-generated/Cargo.toml
index 77819ba..50b1d65 100644
--- a/component-generated/Cargo.toml
+++ b/component-generated/Cargo.toml
@@ -43,5 +43,4 @@ tracing-subscriber = { version = "0.3.18", features = ["env-filter", "serde"] }
 
 [build-dependencies]
 anyhow = "1.0.86"
-vergen = { version = "9.0.0", features = ["build"] }
-vergen-gix = "1.0.0"
+vergen-gix = { version = "1.0.0", features = ["build", "cargo"] }
diff --git a/component-generated/build.rs b/component-generated/build.rs
index 53cbf8b..2461afa 100644
--- a/component-generated/build.rs
+++ b/component-generated/build.rs
@@ -1,12 +1,13 @@
 use anyhow::Result;
-use vergen::{BuildBuilder, Emitter};
-use vergen_gix::GixBuilder;
+use vergen_gix::{BuildBuilder, CargoBuilder, Emitter, GixBuilder};
 
 fn main() -> Result<()> {
     let build = BuildBuilder::all_build()?;
     let gix = GixBuilder::all_git()?;
+    let cargo = CargoBuilder::all_cargo()?;
     Emitter::default()
         .add_instructions(&build)?
         .add_instructions(&gix)?
+        .add_instructions(&cargo)?
         .emit()
 }
diff --git a/component/template/Cargo.toml b/component/template/Cargo.toml
index 7a3e910..3e02937 100644
--- a/component/template/Cargo.toml
+++ b/component/template/Cargo.toml
@@ -44,5 +44,4 @@ tracing-subscriber = { version = "0.3.18", features = ["env-filter", "serde"] }
 
 [build-dependencies]
 anyhow = "1.0.86"
-vergen = { version = "9.0.0", features = ["build"] }
-vergen-gix = "1.0.0"
+vergen-gix = { version = "1.0.0", features = ["build", "cargo"] }
diff --git a/component/template/build.rs b/component/template/build.rs
index 53cbf8b..2461afa 100644
--- a/component/template/build.rs
+++ b/component/template/build.rs
@@ -1,12 +1,13 @@
 use anyhow::Result;
-use vergen::{BuildBuilder, Emitter};
-use vergen_gix::GixBuilder;
+use vergen_gix::{BuildBuilder, CargoBuilder, Emitter, GixBuilder};
 
 fn main() -> Result<()> {
     let build = BuildBuilder::all_build()?;
     let gix = GixBuilder::all_git()?;
+    let cargo = CargoBuilder::all_cargo()?;
     Emitter::default()
         .add_instructions(&build)?
         .add_instructions(&gix)?
+        .add_instructions(&cargo)?
         .emit()
 }