add commit hash to version (#1016)

kczimm · web-flow · commit af93072fa0a2 · 2023-09-14T12:32:18.000-05:00
diff --git a/pgml-extension/Cargo.lock b/pgml-extension/Cargo.lock
diff --git a/pgml-extension/Cargo.toml b/pgml-extension/Cargo.toml
@@ -53,6 +53,9 @@ csv = "1.2"
 [dev-dependencies]
 pgrx-tests = "=0.10.0"
 
+[build-dependencies]
+vergen = { version = "8", features = ["build", "git", "gitcl"] }
+
 [profile.dev]
 panic = "unwind"
 lto = "thin"
diff --git a/pgml-extension/build.rs b/pgml-extension/build.rs
@@ -16,4 +16,6 @@ fn main() {
         "cargo:link-args=-Wl,--version-script={}/ld.map",
         std::env::current_dir().unwrap().to_string_lossy(),
     );
+
+    vergen::EmitBuilder::builder().all_git().emit().unwrap();
 }
diff --git a/pgml-extension/src/api.rs b/pgml-extension/src/api.rs
@@ -84,7 +84,7 @@ pub fn validate_shared_library() {
 
 #[pg_extern(immutable, parallel_safe)]
 fn version() -> String {
-    crate::VERSION.to_string()
+    format!("{} ({})", crate::VERSION, crate::COMMIT)
 }
 
 #[allow(clippy::too_many_arguments)]
diff --git a/pgml-extension/src/lib.rs b/pgml-extension/src/lib.rs
@@ -7,6 +7,7 @@ extern crate signal_hook;
 use pgrx::*;
 
 pub const VERSION: &str = env!("CARGO_PKG_VERSION");
+pub const COMMIT: &str = env!("VERGEN_GIT_SHA");
 
 pub mod api;
 pub mod bindings;

Original file line number	Diff line number	Diff line change
`@@ -16,4 +16,6 @@ fn main() {`
`16`	`16`	`"cargo:link-args=-Wl,--version-script={}/ld.map",`
`17`	`17`	`std::env::current_dir().unwrap().to_string_lossy(),`
`18`	`18`	`);`
	`19`	`+`
	`20`	`+ vergen::EmitBuilder::builder().all_git().emit().unwrap();`
`19`	`21`	`}`
Original file line number	Diff line number	Diff line change
`@@ -84,7 +84,7 @@ pub fn validate_shared_library() {`
`84`	`84`
`85`	`85`	`#[pg_extern(immutable, parallel_safe)]`
`86`	`86`	`fn version() -> String {`
`87`		`- crate::VERSION.to_string()`
	`87`	`+ format!("{} ({})", crate::VERSION, crate::COMMIT)`
`88`	`88`	`}`
`89`	`89`
`90`	`90`	`#[allow(clippy::too_many_arguments)]`