Permalink
Browse files

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
  • Loading branch information...
bors committed Dec 18, 2018
2 parents 642e063 + 0a3f194 commit b6c32da9b0481e3e9d737153286b3ff8aa39a22c
Showing with 5 additions and 2 deletions.
  1. +2 −1 src/ci/docker/mingw-check/Dockerfile
  2. +3 −1 src/tools/build-manifest/src/main.rs
@@ -20,4 +20,5 @@ COPY scripts/sccache.sh /scripts/
RUN sh /scripts/sccache.sh

ENV RUN_CHECK_WITH_PARALLEL_QUERIES 1
ENV SCRIPT python2.7 ../x.py check --target=i686-pc-windows-gnu --host=i686-pc-windows-gnu
ENV SCRIPT python2.7 ../x.py check --target=i686-pc-windows-gnu --host=i686-pc-windows-gnu && \
python2.7 ../x.py build --stage 0 src/tools/build-manifest
@@ -626,8 +626,10 @@ impl Builder {
let asc = self.output.join(format!("{}.asc", filename));
println!("signing: {:?}", path);
let mut cmd = Command::new("gpg");
cmd.arg("--no-tty")
cmd.arg("--pinentry-mode=loopback")
.arg("--no-tty")
.arg("--yes")
.arg("--batch")
.arg("--passphrase-fd").arg("0")
.arg("--personal-digest-preferences").arg("SHA512")
.arg("--armor")

0 comments on commit b6c32da

Please sign in to comment.