From c51c8d3f3a6284e3a540c332e1bd7f7ae1a39d72 Mon Sep 17 00:00:00 2001 From: Jason Ozias Date: Sun, 25 Jun 2023 10:31:48 -0400 Subject: [PATCH] update to gix 0.47.0, fix issue caused by new Time struct (#219) * update to gix 0.47.0, fix issue caused by new Time struct * version bump for next release --- vergen/Cargo.toml | 6 +++--- vergen/src/feature/git/gix.rs | 4 +--- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/vergen/Cargo.toml b/vergen/Cargo.toml index 2579774d..11515eae 100644 --- a/vergen/Cargo.toml +++ b/vergen/Cargo.toml @@ -10,7 +10,7 @@ license = "MIT OR Apache-2.0" name = "vergen" readme = "README.md" repository = "https://github.com/rustyhorde/vergen" -version = "8.2.1" +version = "8.2.2" [package.metadata.cargo-all-features] denylist = [ @@ -41,7 +41,7 @@ si = ["sysinfo"] [dependencies] anyhow = "1.0.70" git2-rs = { version = "0.17.1", package = "git2", optional = true, default-features = false } -gix = { version = "0.46.0", optional = true, default-features = false } +gix = { version = "0.47.0", optional = true, default-features = false } rustc_version = { version = "0.4.0", optional = true } sysinfo = { version = "0.29.0", optional = true, default-features = false } time = { version = "0.3.20", features = [ @@ -53,7 +53,7 @@ time = { version = "0.3.20", features = [ rustversion = "1.0.12" [dev-dependencies] -gix = { version = "0.46.0", default-features = false, features = [ +gix = { version = "0.47.0", default-features = false, features = [ "blocking-network-client", ] } lazy_static = "1.4.0" diff --git a/vergen/src/feature/git/gix.rs b/vergen/src/feature/git/gix.rs index c546042f..9ba6117e 100644 --- a/vergen/src/feature/git/gix.rs +++ b/vergen/src/feature/git/gix.rs @@ -454,9 +454,7 @@ impl EmitBuilder { ), Err(std::env::VarError::NotPresent) => ( false, - OffsetDateTime::from_unix_timestamp( - commit.time()?.seconds_since_unix_epoch.into(), - )?, + OffsetDateTime::from_unix_timestamp(commit.time()?.seconds.try_into()?)?, ), Err(e) => return Err(e.into()), };