diff options
| author | Alex Crichton <alex@alexcrichton.com> | 2017-02-14 09:54:58 -0800 |
|---|---|---|
| committer | Alex Crichton <alex@alexcrichton.com> | 2017-02-15 18:07:16 -0800 |
| commit | 1902488228f889bb1acb1d1f6488efe0015a0db2 (patch) | |
| tree | e221c04a160e7d2292c4c751f7421d5f121d83cc /src/ci/docker | |
| parent | 48bc08247a7b4a5579437df54ca3f4a3fb25ce8d (diff) | |
| download | rust-1902488228f889bb1acb1d1f6488efe0015a0db2.tar.gz rust-1902488228f889bb1acb1d1f6488efe0015a0db2.zip | |
travis: Disable source tarballs on most builders
Currently we create a source tarball on almost all of the `DEPLOY=1` builders but this has the adverse side effect of all source tarballs overriding themselves in the S3 bucket. Normally this is ok but unfortunately a source tarball created on Windows is not buildable on Unix. On Windows the vendored sources contain paths with `\` characters in them which when interpreted on Unix end up in "file not found" errors. Instead of this overwriting behavior, whitelist just one linux builder for producing tarballs and avoid producing tarballs on all other hosts.
Diffstat (limited to 'src/ci/docker')
| -rw-r--r-- | src/ci/docker/dist-x86-linux/Dockerfile | 6 | ||||
| -rw-r--r-- | src/ci/docker/x86_64-gnu-distcheck/Dockerfile | 1 |
2 files changed, 6 insertions, 1 deletions
diff --git a/src/ci/docker/dist-x86-linux/Dockerfile b/src/ci/docker/dist-x86-linux/Dockerfile index 61c23201c2c..f9324991aa0 100644 --- a/src/ci/docker/dist-x86-linux/Dockerfile +++ b/src/ci/docker/dist-x86-linux/Dockerfile @@ -82,5 +82,9 @@ RUN curl -L https://api.pub.build.mozilla.org/tooltool/sha512/$SCCACHE_DIGEST | ENV HOSTS=i686-unknown-linux-gnu ENV HOSTS=$HOSTS,x86_64-unknown-linux-gnu -ENV RUST_CONFIGURE_ARGS --host=$HOSTS --enable-extended --enable-sanitizers +ENV RUST_CONFIGURE_ARGS \ + --host=$HOSTS \ + --enable-extended \ + --enable-sanitizers ENV SCRIPT python2.7 ../x.py dist --host $HOSTS --target $HOSTS +ENV DIST_SRC 1 diff --git a/src/ci/docker/x86_64-gnu-distcheck/Dockerfile b/src/ci/docker/x86_64-gnu-distcheck/Dockerfile index ad6c0c15f72..afa99ca2b86 100644 --- a/src/ci/docker/x86_64-gnu-distcheck/Dockerfile +++ b/src/ci/docker/x86_64-gnu-distcheck/Dockerfile @@ -26,3 +26,4 @@ ENTRYPOINT ["/usr/bin/dumb-init", "--"] ENV RUST_CONFIGURE_ARGS --build=x86_64-unknown-linux-gnu ENV SCRIPT python2.7 ../x.py test distcheck +ENV DIST_SRC 1 |