mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Explicitly disable git gpg signing

Browse Source 
Otherwise building fails if the user has globally enabled gpg signing.

Fixes #1384
This commit is contained in:
bjorn3 2023-07-12 17:21:14 +00:00
parent 34d63e4c1d
commit c137418bde
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
build_system/utils.rs
View File

@ -168,6 +168,8 @@ pub(crate) fn git_command<'a>(repo_dir: impl Into<Option<&'a Path>>, cmd: &str)
.arg("user.email=dummy@example.com") .arg("user.email=dummy@example.com")
.arg("-c") .arg("-c")
.arg("core.autocrlf=false") .arg("core.autocrlf=false")
.arg("-c")
.arg("commit.gpgSign=false")
.arg(cmd); .arg(cmd);
if let Some(repo_dir) = repo_dir.into() { if let Some(repo_dir) = repo_dir.into() {
git_cmd.current_dir(repo_dir); git_cmd.current_dir(repo_dir);

3
scripts/setup_rust_fork.sh
View File

@ -10,7 +10,8 @@ git fetch
git checkout -- . git checkout -- .
git checkout "$(rustc -V | cut -d' ' -f3 | tr -d '(')" git checkout "$(rustc -V | cut -d' ' -f3 | tr -d '(')"
git -c user.name=Dummy -c user.email=dummy@example.com am ../patches/*-stdlib-*.patch git -c user.name=Dummy -c user.email=dummy@example.com -c commit.gpgSign=false \
am ../patches/*-stdlib-*.patch
git apply - <<EOF git apply - <<EOF
diff --git a/library/alloc/Cargo.toml b/library/alloc/Cargo.toml diff --git a/library/alloc/Cargo.toml b/library/alloc/Cargo.toml