diff options
| author | bors <bors@rust-lang.org> | 2018-12-18 23:09:34 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2018-12-18 23:09:34 +0000 |
| commit | b6c32da9b0481e3e9d737153286b3ff8aa39a22c (patch) | |
| tree | 05fbee5c77c81c3dbb05bbfd64b0bb7e004c289f | |
| parent | 642e063a6e535289241d1a0ec4cf1c559c892db9 (diff) | |
| parent | 0a3f194a1de13de7d873a0387085dda2b7777cd9 (diff) | |
| download | rust-b6c32da9b0481e3e9d737153286b3ff8aa39a22c.tar.gz | |
Auto merge of #56960 - pietroalbini:gpg-stable, r=pietroalbini1.31.1
[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
| -rw-r--r-- | src/ci/docker/mingw-check/Dockerfile | 3 | ||||
| -rw-r--r-- | src/tools/build-manifest/src/main.rs | 4 |
2 files changed, 5 insertions, 2 deletions
diff --git a/src/ci/docker/mingw-check/Dockerfile b/src/ci/docker/mingw-check/Dockerfile index aab339f399c..10aedf6a60e 100644 --- a/src/ci/docker/mingw-check/Dockerfile +++ b/src/ci/docker/mingw-check/Dockerfile @@ -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 diff --git a/src/tools/build-manifest/src/main.rs b/src/tools/build-manifest/src/main.rs index 0a39135ad8a..7b03eafddef 100644 --- a/src/tools/build-manifest/src/main.rs +++ b/src/tools/build-manifest/src/main.rs @@ -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") |