diff --git a/Cargo.lock b/Cargo.lock index ddf3c11..88739ff 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -128,6 +128,9 @@ name = "cc" version = "1.0.73" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2fff2a6927b3bb87f9595d67196a70493f627687a71d87a0d692242c33f58c11" +dependencies = [ + "jobserver", +] [[package]] name = "cfg-if" @@ -532,6 +535,19 @@ dependencies = [ "syn", ] +[[package]] +name = "git2" +version = "0.14.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d0155506aab710a86160ddb504a480d2964d7ab5b9e62419be69e0032bc5931c" +dependencies = [ + "bitflags", + "libc", + "libgit2-sys", + "log", + "url", +] + [[package]] name = "h2" version = "0.3.13" @@ -743,6 +759,15 @@ version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "112c678d4050afce233f4f2852bb2eb519230b3cf12f33585275537d7e41578d" +[[package]] +name = "jobserver" +version = "0.1.24" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "af25a77299a7f711a01975c35a6a424eb6862092cc2d6c72c4ed6cbc56dfc1fa" +dependencies = [ + "libc", +] + [[package]] name = "js-sys" version = "0.3.58" @@ -764,6 +789,30 @@ version = "0.2.126" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "349d5a591cd28b49e1d1037471617a32ddcda5731b99419008085f72d5a53836" +[[package]] +name = "libgit2-sys" +version = "0.13.4+1.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d0fa6563431ede25f5cc7f6d803c6afbc1c5d3ad3d4925d12c882bf2b526f5d1" +dependencies = [ + "cc", + "libc", + "libz-sys", + "pkg-config", +] + +[[package]] +name = "libz-sys" +version = "1.1.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9702761c3935f8cc2f101793272e202c72b99da8f4224a19ddcf1279a6450bbf" +dependencies = [ + "cc", + "libc", + "pkg-config", + "vcpkg", +] + [[package]] name = "linked-hash-map" version = "0.5.4" @@ -1936,6 +1985,7 @@ dependencies = [ "cfg-if", "enum-iterator", "getset", + "git2", "rustc_version", "rustversion", "thiserror", diff --git a/bot/Cargo.toml b/bot/Cargo.toml index d95d637..d770dbf 100644 --- a/bot/Cargo.toml +++ b/bot/Cargo.toml @@ -7,8 +7,8 @@ version = "0.1.4" eh2telegraph = {path = "../eh2telegraph"} anyhow = "1" -clap = {version = "3", features = ["derive"]} chrono = "0.4" +clap = {version = "3", features = ["derive"]} dptree = "0.2" once_cell = "1" regex = "1" @@ -22,4 +22,4 @@ tracing = "0.1" tracing-subscriber = {version = "0.3", features = ["local-time", "parking_lot", "time"]} [build-dependencies] -vergen = {version = "7", default_features = false, features = ["build", "cargo", "rustc"]} +vergen = {version = "7", default_features = false, features = ["build", "cargo", "rustc", "git"]} diff --git a/bot/src/version.rs b/bot/src/version.rs index 47992e3..9bd4ee4 100644 --- a/bot/src/version.rs +++ b/bot/src/version.rs @@ -1,18 +1,25 @@ pub(crate) static VERSION: &str = concat!( "\n", - "Build Timestamp: \t", + "Build Timestamp:\t", env!("VERGEN_BUILD_TIMESTAMP"), "\n", - "Package Version: \t", + "Package Version:\t", env!("VERGEN_BUILD_SEMVER"), "\n", - "rustc Version: \t\t", + "Git Commit SHA: \t", + env!("VERGEN_GIT_SHA"), + "\n", + "Git Commit Date:\t", + env!("VERGEN_GIT_COMMIT_TIMESTAMP"), + "\n", + "rustc Version: \t", env!("VERGEN_RUSTC_SEMVER"), "\n", - "cargo Profile: \t\t", + "Cargo Profile: \t", env!("VERGEN_CARGO_PROFILE"), "\n", - "cargo Target: \t\t", + "Cargo Target: \t", env!("VERGEN_CARGO_TARGET_TRIPLE"), "\n", + "Source code: \thttps://github.com/qini7-sese/eh2telegraph" );