Skip to content

Commit 2765575

Browse files
committed
Fix conditions to allow missing tools in CI
1 parent 0724ed6 commit 2765575

File tree

4 files changed

+8
-2
lines changed

4 files changed

+8
-2
lines changed

config.toml.example

+4
Original file line numberDiff line numberDiff line change
@@ -481,3 +481,7 @@
481481
# as the one built on Windows will contain backslashes in paths causing problems
482482
# on linux
483483
#src-tarball = true
484+
#
485+
486+
# Whether to allow failures when building tools
487+
#missing-tools = false

src/bootstrap/config.rs

+2
Original file line numberDiff line numberDiff line change
@@ -272,6 +272,7 @@ struct Dist {
272272
gpg_password_file: Option<String>,
273273
upload_addr: Option<String>,
274274
src_tarball: Option<bool>,
275+
missing_tools: Option<bool>,
275276
}
276277

277278
#[derive(Deserialize)]
@@ -615,6 +616,7 @@ impl Config {
615616
config.dist_gpg_password_file = t.gpg_password_file.clone().map(PathBuf::from);
616617
config.dist_upload_addr = t.upload_addr.clone();
617618
set(&mut config.rust_dist_src, t.src_tarball);
619+
set(&mut config.missing_tools, t.missing_tools);
618620
}
619621

620622
// Now that we've reached the end of our configuration, infer the

src/bootstrap/configure.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ def v(*args):
6969
o("emscripten", None, "compile the emscripten backend as well as LLVM")
7070
o("full-tools", None, "enable all tools")
7171
o("lldb", "rust.lldb", "build lldb")
72-
o("enable-missing-tools", "build.missing-tools", "allow failures when building tools")
72+
o("missing-tools", "dist.missing-tools", "allow failures when building tools")
7373

7474
# Optimization and debugging options. These may be overridden by the release
7575
# channel, etc.

src/ci/run.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ else
7676
fi
7777
fi
7878

79-
if [ "$RUST_RELEASE_CHANNEL" = "nightly" ] or [ "$DIST_REQUIRE_ALL_TOOLS" = "" ]; then
79+
if [ "$RUST_RELEASE_CHANNEL" = "nightly" ] || [ "$DIST_REQUIRE_ALL_TOOLS" = "" ]; then
8080
RUST_CONFIGURE_ARGS="$RUST_CONFIGURE_ARGS --enable-missing-tools"
8181
fi
8282

0 commit comments

Comments
 (0)