diff options
| author | Christian Poveda <christianpoveda@protonmail.com> | 2018-09-28 02:07:44 -0500 |
|---|---|---|
| committer | Christian Poveda <christianpoveda@protonmail.com> | 2018-09-28 08:55:18 -0500 |
| commit | 0724ed68bb0c6c5be89753f1da13ea27dfe2301d (patch) | |
| tree | d59c4af359d14154ff724a2a9885670cb757423f | |
| parent | 53254a888b424b02b1daaedfae63acb4e3231912 (diff) | |
| download | rust-0724ed68bb0c6c5be89753f1da13ea27dfe2301d.tar.gz rust-0724ed68bb0c6c5be89753f1da13ea27dfe2301d.zip | |
Add DIST_REQUIRE_ALL_TOOLS to CI scripts
| -rw-r--r-- | .travis.yml | 2 | ||||
| -rw-r--r-- | appveyor.yml | 4 | ||||
| -rw-r--r-- | src/ci/docker/dist-i686-linux/Dockerfile | 2 | ||||
| -rw-r--r-- | src/ci/docker/dist-x86_64-linux/Dockerfile | 2 |
4 files changed, 10 insertions, 0 deletions
diff --git a/.travis.yml b/.travis.yml index 0646f4d4687..ec8060b9f56 100644 --- a/.travis.yml +++ b/.travis.yml @@ -94,6 +94,7 @@ matrix: MACOSX_DEPLOYMENT_TARGET=10.7 NO_LLVM_ASSERTIONS=1 NO_DEBUG_ASSERTIONS=1 + DIST_REQUIRE_ALL_TOOLS=1 CI_JOB_NAME=dist-i686-apple os: osx osx_image: xcode9.3-moar @@ -108,6 +109,7 @@ matrix: MACOSX_DEPLOYMENT_TARGET=10.7 NO_LLVM_ASSERTIONS=1 NO_DEBUG_ASSERTIONS=1 + DIST_REQUIRE_ALL_TOOLS=1 CI_JOB_NAME=dist-x86_64-apple os: osx osx_image: xcode9.3-moar diff --git a/appveyor.yml b/appveyor.yml index b1e2e1545cf..04951454c29 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -85,6 +85,7 @@ environment: --enable-full-tools --enable-profiler SCRIPT: python x.py dist + DIST_REQUIRE_ALL_TOOLS: 1 DEPLOY: 1 CI_JOB_NAME: dist-x86_64-msvc - RUST_CONFIGURE_ARGS: > @@ -93,6 +94,7 @@ environment: --enable-full-tools --enable-profiler SCRIPT: python x.py dist + DIST_REQUIRE_ALL_TOOLS: 1 DEPLOY: 1 CI_JOB_NAME: dist-i686-msvc - MSYS_BITS: 32 @@ -101,6 +103,7 @@ environment: MINGW_URL: https://s3-us-west-1.amazonaws.com/rust-lang-ci2/rust-ci-mirror MINGW_ARCHIVE: i686-6.3.0-release-posix-dwarf-rt_v5-rev2.7z MINGW_DIR: mingw32 + DIST_REQUIRE_ALL_TOOLS: 1 DEPLOY: 1 CI_JOB_NAME: dist-i686-mingw - MSYS_BITS: 64 @@ -109,6 +112,7 @@ environment: MINGW_URL: https://s3-us-west-1.amazonaws.com/rust-lang-ci2/rust-ci-mirror MINGW_ARCHIVE: x86_64-6.3.0-release-posix-seh-rt_v5-rev2.7z MINGW_DIR: mingw64 + DIST_REQUIRE_ALL_TOOLS: 1 DEPLOY: 1 CI_JOB_NAME: dist-x86_64-mingw diff --git a/src/ci/docker/dist-i686-linux/Dockerfile b/src/ci/docker/dist-i686-linux/Dockerfile index d591fb28f36..8a84e474687 100644 --- a/src/ci/docker/dist-i686-linux/Dockerfile +++ b/src/ci/docker/dist-i686-linux/Dockerfile @@ -110,3 +110,5 @@ ENV CFLAGS -mstackrealign # When we build cargo in this container, we don't want it to use the system # libcurl, instead it should compile its own. ENV LIBCURL_NO_PKG_CONFIG 1 + +ENV DIST_REQUIRE_ALL_TOOLS 1 diff --git a/src/ci/docker/dist-x86_64-linux/Dockerfile b/src/ci/docker/dist-x86_64-linux/Dockerfile index 01f6db03e8e..7e3cc10b0c1 100644 --- a/src/ci/docker/dist-x86_64-linux/Dockerfile +++ b/src/ci/docker/dist-x86_64-linux/Dockerfile @@ -106,3 +106,5 @@ ENV DIST_SRC 1 # When we build cargo in this container, we don't want it to use the system # libcurl, instead it should compile its own. ENV LIBCURL_NO_PKG_CONFIG 1 + +ENV DIST_REQUIRE_ALL_TOOLS 1 |