holm/nushell
1
1
Fork 0
forked from extern/nushell
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Look up git commit hash ourselves, drop libgit2 dependency (#5548)

Browse Source
This commit is contained in:
Reilly Wood 2022-05-15 21:57:25 -04:00 committed by GitHub
parent 44bcfb3403
commit d90b25c633
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 19 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Cargo.lock generated
View File

@ -4191,7 +4191,6 @@ checksum = "f47e98e36909e951f4da3908f4475f969bec92a41734dd92e883aaa11c10294b"
dependencies = [
"chrono",
"const_format",
"git2",
"is_debug",
]

5
crates/nu-command/Cargo.toml
View File

@ -70,7 +70,8 @@ serde_ini = "0.2.0"
serde_urlencoded = "0.7.0"
serde_yaml = "0.8.16"
sha2 = "0.10.0"
shadow-rs = "0.11.0"
# Disable default features b/c the default features build Git (very slow to compile)
shadow-rs = { version = "0.11.0", default-features = false }
strip-ansi-escapes = "0.1.1"
sysinfo = "0.23.5"
terminal_size = "0.1.17"
@ -112,7 +113,7 @@ dataframe = ["polars", "num"]
database = ["sqlparser", "rusqlite"]
[build-dependencies]
shadow-rs = "0.11.0"
shadow-rs = { version = "0.11.0", default-features = false }
[dev-dependencies]
hamcrest2 = "0.3.0"

15
crates/nu-command/build.rs
View File

@ -1,3 +1,18 @@
use std::process::Command;
fn main() -> shadow_rs::SdResult<()> {
// Look up the current Git commit ourselves instead of relying on shadow_rs,
// because shadow_rs does it in a really slow-to-compile way (it builds libgit2)
let hash = get_git_hash().expect("failed to get latest git commit hash");
println!("cargo:rustc-env=NU_COMMIT_HASH={}", hash);
shadow_rs::new()
}
fn get_git_hash() -> Result<String, std::io::Error> {
let out = Command::new("git").args(["rev-parse", "HEAD"]).output()?;
Ok(String::from_utf8(out.stdout)
.expect("could not convert stdout to string")
.trim()
.to_string())
}

24
crates/nu-command/src/core_commands/version.rs
View File

@ -63,21 +63,7 @@ pub fn version(
span: call.head,
});
cols.push("tag".to_string());
vals.push(Value::String {
val: shadow_rs::tag(),
span: call.head,
});
let short_commit: Option<&str> = Some(shadow::SHORT_COMMIT).filter(|x| !x.is_empty());
if let Some(short_commit) = short_commit {
cols.push("short_commit".to_string());
vals.push(Value::String {
val: short_commit.to_string(),
span: call.head,
});
}
let commit_hash: Option<&str> = Some(shadow::COMMIT_HASH).filter(|x| !x.is_empty());
let commit_hash: Option<&str> = option_env!("NU_COMMIT_HASH");
if let Some(commit_hash) = commit_hash {
cols.push("commit_hash".to_string());
vals.push(Value::String {
@ -85,14 +71,6 @@ pub fn version(
span: call.head,
});
}
let commit_date: Option<&str> = Some(shadow::COMMIT_DATE).filter(|x| !x.is_empty());
if let Some(commit_date) = commit_date {
cols.push("commit_date".to_string());
vals.push(Value::String {
val: commit_date.to_string(),
span: call.head,
});
}
let build_os: Option<&str> = Some(shadow::BUILD_OS).filter(|x| !x.is_empty());
if let Some(build_os) = build_os {