Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
115 changes: 109 additions & 6 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -179,6 +179,6 @@ smallvec = { version = "1", features = ["const_generics", "union"] }
thread_local = "1.1"
typed-arena = "2.0"
unicode-width = "0.2"
vergen = "8"
vergen = { package = "vergen-gitcl", version = "2.1.0-beta.9" }

[patch.crates-io]
3 changes: 1 addition & 2 deletions crates/config/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,8 @@ workspace = true
[build-dependencies]
vergen = { workspace = true, optional = true, features = [
"build",
"git",
"gitcl",
"cargo",
"emit_and_set",
] }

[dependencies]
Expand Down
21 changes: 11 additions & 10 deletions crates/config/build.rs
Original file line number Diff line number Diff line change
@@ -1,16 +1,15 @@
#[cfg(feature = "version")]
fn main() {
fn main() -> Result<(), Box<dyn std::error::Error>> {
use std::env;

vergen::EmitBuilder::builder()
.git_describe(false, true, None)
.git_dirty(true)
.git_sha(false)
.build_timestamp()
.cargo_features()
.cargo_target_triple()
.emit_and_set()
.unwrap();
let cargo = vergen::Cargo::builder().features(true).target_triple(true).build();
let build = vergen::Build::builder().build_timestamp(true).build();
let git = vergen::Gitcl::builder().describe(false, true, None).dirty(true).sha(false).build();
vergen::Emitter::new()
.add_instructions(&cargo)?
.add_instructions(&build)?
.add_instructions(&git)?
.emit_and_set()?;

let sha = env::var("VERGEN_GIT_SHA").unwrap();
let sha_short = &sha[..7];
Expand Down Expand Up @@ -59,6 +58,8 @@ fn main() {
for (i, line) in long_version.lines().enumerate() {
println!("cargo:rustc-env=LONG_VERSION{i}={line}");
}

Ok(())
}

#[cfg(not(feature = "version"))]
Expand Down
Loading