Skip to content

Commit a01b0bf

Browse files
committed
Auto merge of #56961 - pietroalbini:gpg-beta, r=pietroalbini
[beta] Backport fixes to build-manifest Backports the following changes to beta: * #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 a1b9cf6 + 9b226dd commit a01b0bf

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
@@ -621,8 +621,10 @@ impl Builder {
621621
let asc = self.output.join(format!("{}.asc", filename));
622622
println!("signing: {:?}", path);
623623
let mut cmd = Command::new("gpg");
624-
cmd.arg("--no-tty")
624+
cmd.arg("--pinentry-mode=loopback")
625+
.arg("--no-tty")
625626
.arg("--yes")
627+
.arg("--batch")
626628
.arg("--passphrase-fd").arg("0")
627629
.arg("--personal-digest-preferences").arg("SHA512")
628630
.arg("--armor")

0 commit comments

Comments
 (0)