langfingaz/anki
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Avoid setting path when invoking git

Browse Source 
We don't need the amended path, and it seems to break things for
a user:

https://forums.ankiweb.net/t/anki-2-1-55-beta-5-6/24870/89
This commit is contained in:
Damien Elmes 2022-12-07 18:26:14 +10:00
parent 0e7f02bfb7
commit 09bfe104d8
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
build/runner/src/build.rs
View File

@ -29,7 +29,7 @@ pub fn run_build(args: BuildArgs) {
};
maybe_update_env_file(build_root);
maybe_update_buildhash(build_root, &path);
maybe_update_buildhash(build_root);
// Ensure build file is up to date
let build_file = build_root.join("build.ninja");
@ -138,18 +138,17 @@ fn bootstrap_build() {
assert!(status.expect("ninja").success());
}
fn maybe_update_buildhash(build_root: &Utf8Path, path_env: &str) {
fn maybe_update_buildhash(build_root: &Utf8Path) {
// only updated on release builds
let path = build_root.join("buildhash");
if env::var("RELEASE").is_ok() || !path.exists() {
write_if_changed(&path, &get_buildhash(path_env))
write_if_changed(&path, &get_buildhash())
}
}
fn get_buildhash(path: &str) -> String {
fn get_buildhash() -> String {
let output = Command::new("git")
.args(["rev-parse", "--short=8", "HEAD"])
.env("PATH", path)
.output()
.expect("git");
assert!(output.status.success(), "git failed");