From 88a920b1a5fd64341266fb70a4f257ca5882849a 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 5a82573b443a22a1dbb347c289cf054a866c30c2 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 bf95b31ae3ca4..1d1e67419ca92 100644 --- a/src/tools/build-manifest/src/main.rs +++ b/src/tools/build-manifest/src/main.rs @@ -623,6 +623,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 9b226ddfd3111c2afa913d3427c9043e55c8b925 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 1d1e67419ca92..20daa5d2ab54e 100644 --- a/src/tools/build-manifest/src/main.rs +++ b/src/tools/build-manifest/src/main.rs @@ -621,7 +621,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")