Skip to content

Commit 0724ed6

Browse files
committed
Add DIST_REQUIRE_ALL_TOOLS to CI scripts
1 parent 53254a8 commit 0724ed6

File tree

4 files changed

+10
-0
lines changed

4 files changed

+10
-0
lines changed

.travis.yml

+2
Original file line numberDiff line numberDiff line change
@@ -94,6 +94,7 @@ matrix:
9494
MACOSX_DEPLOYMENT_TARGET=10.7
9595
NO_LLVM_ASSERTIONS=1
9696
NO_DEBUG_ASSERTIONS=1
97+
DIST_REQUIRE_ALL_TOOLS=1
9798
CI_JOB_NAME=dist-i686-apple
9899
os: osx
99100
osx_image: xcode9.3-moar
@@ -108,6 +109,7 @@ matrix:
108109
MACOSX_DEPLOYMENT_TARGET=10.7
109110
NO_LLVM_ASSERTIONS=1
110111
NO_DEBUG_ASSERTIONS=1
112+
DIST_REQUIRE_ALL_TOOLS=1
111113
CI_JOB_NAME=dist-x86_64-apple
112114
os: osx
113115
osx_image: xcode9.3-moar

appveyor.yml

+4
Original file line numberDiff line numberDiff line change
@@ -85,6 +85,7 @@ environment:
8585
--enable-full-tools
8686
--enable-profiler
8787
SCRIPT: python x.py dist
88+
DIST_REQUIRE_ALL_TOOLS: 1
8889
DEPLOY: 1
8990
CI_JOB_NAME: dist-x86_64-msvc
9091
- RUST_CONFIGURE_ARGS: >
@@ -93,6 +94,7 @@ environment:
9394
--enable-full-tools
9495
--enable-profiler
9596
SCRIPT: python x.py dist
97+
DIST_REQUIRE_ALL_TOOLS: 1
9698
DEPLOY: 1
9799
CI_JOB_NAME: dist-i686-msvc
98100
- MSYS_BITS: 32
@@ -101,6 +103,7 @@ environment:
101103
MINGW_URL: https://s3-us-west-1.amazonaws.com/rust-lang-ci2/rust-ci-mirror
102104
MINGW_ARCHIVE: i686-6.3.0-release-posix-dwarf-rt_v5-rev2.7z
103105
MINGW_DIR: mingw32
106+
DIST_REQUIRE_ALL_TOOLS: 1
104107
DEPLOY: 1
105108
CI_JOB_NAME: dist-i686-mingw
106109
- MSYS_BITS: 64
@@ -109,6 +112,7 @@ environment:
109112
MINGW_URL: https://s3-us-west-1.amazonaws.com/rust-lang-ci2/rust-ci-mirror
110113
MINGW_ARCHIVE: x86_64-6.3.0-release-posix-seh-rt_v5-rev2.7z
111114
MINGW_DIR: mingw64
115+
DIST_REQUIRE_ALL_TOOLS: 1
112116
DEPLOY: 1
113117
CI_JOB_NAME: dist-x86_64-mingw
114118

src/ci/docker/dist-i686-linux/Dockerfile

+2
Original file line numberDiff line numberDiff line change
@@ -110,3 +110,5 @@ ENV CFLAGS -mstackrealign
110110
# When we build cargo in this container, we don't want it to use the system
111111
# libcurl, instead it should compile its own.
112112
ENV LIBCURL_NO_PKG_CONFIG 1
113+
114+
ENV DIST_REQUIRE_ALL_TOOLS 1

src/ci/docker/dist-x86_64-linux/Dockerfile

+2
Original file line numberDiff line numberDiff line change
@@ -106,3 +106,5 @@ ENV DIST_SRC 1
106106
# When we build cargo in this container, we don't want it to use the system
107107
# libcurl, instead it should compile its own.
108108
ENV LIBCURL_NO_PKG_CONFIG 1
109+
110+
ENV DIST_REQUIRE_ALL_TOOLS 1

0 commit comments

Comments
 (0)