diff options
| author | bjorn3 <17426603+bjorn3@users.noreply.github.com> | 2023-07-12 17:21:14 +0000 |
|---|---|---|
| committer | bjorn3 <17426603+bjorn3@users.noreply.github.com> | 2023-07-12 17:21:14 +0000 |
| commit | c137418bde2463dd5d33ecfd9ea61d5ea6732207 (patch) | |
| tree | 96f375e52939f25a02da4d0381734c3fc48c733e | |
| parent | 34d63e4c1d8700ebadc67a2672409f161a2a7777 (diff) | |
| download | rust-c137418bde2463dd5d33ecfd9ea61d5ea6732207.tar.gz rust-c137418bde2463dd5d33ecfd9ea61d5ea6732207.zip | |
Explicitly disable git gpg signing
Otherwise building fails if the user has globally enabled gpg signing. Fixes #1384
| -rw-r--r-- | build_system/utils.rs | 2 | ||||
| -rw-r--r-- | scripts/setup_rust_fork.sh | 3 |
2 files changed, 4 insertions, 1 deletions
diff --git a/build_system/utils.rs b/build_system/utils.rs index 92a33b8bf4d..0b6f344453b 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<Option<&'a Path>>, 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 2cbbbdded5b..e6bbac647e5 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 - <<EOF diff --git a/library/alloc/Cargo.toml b/library/alloc/Cargo.toml |