Skip to content
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.

Commit b6c32da

Browse files
committedDec 18, 2018
Auto merge of #56960 - pietroalbini:gpg-stable, r=pietroalbini
[stable] Backport fixes to build-manifest Backports the following changes to stable: * #56703: Fix build of the `build-manifest` tool *(partial, just added last commit)* * #56783: Add `--pinentry-mode=loopback` to deployment script * #56735: Fix gpg signing in manifest builder r? @ghost cc @Mark-Simulacrum @alexcrichton
2 parents 642e063 + 0a3f194 commit b6c32da

File tree

2 files changed

+5
-2
lines changed

2 files changed

+5
-2
lines changed
 

‎src/ci/docker/mingw-check/Dockerfile

+2-1
Original file line numberDiff line numberDiff line change
@@ -20,4 +20,5 @@ COPY scripts/sccache.sh /scripts/
2020
RUN sh /scripts/sccache.sh
2121

2222
ENV RUN_CHECK_WITH_PARALLEL_QUERIES 1
23-
ENV SCRIPT python2.7 ../x.py check --target=i686-pc-windows-gnu --host=i686-pc-windows-gnu
23+
ENV SCRIPT python2.7 ../x.py check --target=i686-pc-windows-gnu --host=i686-pc-windows-gnu && \
24+
python2.7 ../x.py build --stage 0 src/tools/build-manifest

‎src/tools/build-manifest/src/main.rs

+3-1
Original file line numberDiff line numberDiff line change
@@ -626,8 +626,10 @@ impl Builder {
626626
let asc = self.output.join(format!("{}.asc", filename));
627627
println!("signing: {:?}", path);
628628
let mut cmd = Command::new("gpg");
629-
cmd.arg("--no-tty")
629+
cmd.arg("--pinentry-mode=loopback")
630+
.arg("--no-tty")
630631
.arg("--yes")
632+
.arg("--batch")
631633
.arg("--passphrase-fd").arg("0")
632634
.arg("--personal-digest-preferences").arg("SHA512")
633635
.arg("--armor")

0 commit comments

Comments
 (0)
Please sign in to comment.