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 /src/ci/docker/mingw-check | |
| parent | 642e063a6e535289241d1a0ec4cf1c559c892db9 (diff) | |
| parent | 0a3f194a1de13de7d873a0387085dda2b7777cd9 (diff) | |
| download | rust-1.31.1.tar.gz rust-1.31.1.zip | |
Auto merge of #56960 - pietroalbini:gpg-stable, r=pietroalbini 1.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
Diffstat (limited to 'src/ci/docker/mingw-check')
| -rw-r--r-- | src/ci/docker/mingw-check/Dockerfile | 3 |
1 files changed, 2 insertions, 1 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 |