From c137418bde2463dd5d33ecfd9ea61d5ea6732207 Mon Sep 17 00:00:00 2001 From: bjorn3 <17426603+bjorn3@users.noreply.github.com> Date: Wed, 12 Jul 2023 17:21:14 +0000 Subject: [PATCH] Explicitly disable git gpg signing Otherwise building fails if the user has globally enabled gpg signing. Fixes #1384 --- build_system/utils.rs | 2 ++ scripts/setup_rust_fork.sh | 3 ++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/build_system/utils.rs b/build_system/utils.rs index 92a33b8bf4db..0b6f344453b6 100644 --- a/build_system/utils.rs +++ b/build_system/utils.rs @@ -168,6 +168,8 @@ pub(crate) fn git_command<'a>(repo_dir: impl Into>, cmd: &str) .arg("user.email=dummy@example.com") .arg("-c") .arg("core.autocrlf=false") + .arg("-c") + .arg("commit.gpgSign=false") .arg(cmd); if let Some(repo_dir) = repo_dir.into() { git_cmd.current_dir(repo_dir); diff --git a/scripts/setup_rust_fork.sh b/scripts/setup_rust_fork.sh index 2cbbbdded5bb..e6bbac647e5a 100644 --- a/scripts/setup_rust_fork.sh +++ b/scripts/setup_rust_fork.sh @@ -10,7 +10,8 @@ git fetch git checkout -- . 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 - <