From ca66a4ba94d76c37ae0b0d92165698875db9d905 Mon Sep 17 00:00:00 2001 From: Mark Rousskov Date: Mon, 10 Dec 2018 20:40:04 -0700 Subject: [PATCH 1/3] Build manifest tool on mingw-check builder This builder is not really the correct place to put this, but it definitely has the time budget and checking this tool builds on just one platform is more than sufficient. --- src/ci/docker/mingw-check/Dockerfile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/ci/docker/mingw-check/Dockerfile b/src/ci/docker/mingw-check/Dockerfile index aab339f399c59..10aedf6a60e10 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 From 12ca8e0645ddf877605eb63b79332ab3492baf4f Mon Sep 17 00:00:00 2001 From: Mark Rousskov Date: Tue, 11 Dec 2018 19:10:45 -0700 Subject: [PATCH 2/3] Fix gpg signing in manifest builder GPG versions 2.x+ require that --batch be passed if --passphrase-fd is to be accepted. --- src/tools/build-manifest/src/main.rs | 1 + 1 file changed, 1 insertion(+) diff --git a/src/tools/build-manifest/src/main.rs b/src/tools/build-manifest/src/main.rs index 0a39135ad8a76..00e52ae7e6230 100644 --- a/src/tools/build-manifest/src/main.rs +++ b/src/tools/build-manifest/src/main.rs @@ -628,6 +628,7 @@ impl Builder { let mut cmd = Command::new("gpg"); cmd.arg("--no-tty") .arg("--yes") + .arg("--batch") .arg("--passphrase-fd").arg("0") .arg("--personal-digest-preferences").arg("SHA512") .arg("--armor") From 0a3f194a1de13de7d873a0387085dda2b7777cd9 Mon Sep 17 00:00:00 2001 From: Alex Crichton Date: Thu, 13 Dec 2018 08:19:06 -0800 Subject: [PATCH 3/3] Add `--pinentry-mode=loopback` to deployment script Apparently this changed with gpg2 or... something like that? --- src/tools/build-manifest/src/main.rs | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/tools/build-manifest/src/main.rs b/src/tools/build-manifest/src/main.rs index 00e52ae7e6230..7b03eafddefe8 100644 --- a/src/tools/build-manifest/src/main.rs +++ b/src/tools/build-manifest/src/main.rs @@ -626,7 +626,8 @@ 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")