Fix conditions to allow missing tools in CI
This commit is contained in:
parent
0724ed68bb
commit
276557504d
4 changed files with 8 additions and 2 deletions
|
@ -481,3 +481,7 @@
|
||||||
# as the one built on Windows will contain backslashes in paths causing problems
|
# as the one built on Windows will contain backslashes in paths causing problems
|
||||||
# on linux
|
# on linux
|
||||||
#src-tarball = true
|
#src-tarball = true
|
||||||
|
#
|
||||||
|
|
||||||
|
# Whether to allow failures when building tools
|
||||||
|
#missing-tools = false
|
||||||
|
|
|
@ -272,6 +272,7 @@ struct Dist {
|
||||||
gpg_password_file: Option<String>,
|
gpg_password_file: Option<String>,
|
||||||
upload_addr: Option<String>,
|
upload_addr: Option<String>,
|
||||||
src_tarball: Option<bool>,
|
src_tarball: Option<bool>,
|
||||||
|
missing_tools: Option<bool>,
|
||||||
}
|
}
|
||||||
|
|
||||||
#[derive(Deserialize)]
|
#[derive(Deserialize)]
|
||||||
|
@ -615,6 +616,7 @@ impl Config {
|
||||||
config.dist_gpg_password_file = t.gpg_password_file.clone().map(PathBuf::from);
|
config.dist_gpg_password_file = t.gpg_password_file.clone().map(PathBuf::from);
|
||||||
config.dist_upload_addr = t.upload_addr.clone();
|
config.dist_upload_addr = t.upload_addr.clone();
|
||||||
set(&mut config.rust_dist_src, t.src_tarball);
|
set(&mut config.rust_dist_src, t.src_tarball);
|
||||||
|
set(&mut config.missing_tools, t.missing_tools);
|
||||||
}
|
}
|
||||||
|
|
||||||
// Now that we've reached the end of our configuration, infer the
|
// Now that we've reached the end of our configuration, infer the
|
||||||
|
|
|
@ -69,7 +69,7 @@ o("profiler", "build.profiler", "build the profiler runtime")
|
||||||
o("emscripten", None, "compile the emscripten backend as well as LLVM")
|
o("emscripten", None, "compile the emscripten backend as well as LLVM")
|
||||||
o("full-tools", None, "enable all tools")
|
o("full-tools", None, "enable all tools")
|
||||||
o("lldb", "rust.lldb", "build lldb")
|
o("lldb", "rust.lldb", "build lldb")
|
||||||
o("enable-missing-tools", "build.missing-tools", "allow failures when building tools")
|
o("missing-tools", "dist.missing-tools", "allow failures when building tools")
|
||||||
|
|
||||||
# Optimization and debugging options. These may be overridden by the release
|
# Optimization and debugging options. These may be overridden by the release
|
||||||
# channel, etc.
|
# channel, etc.
|
||||||
|
|
|
@ -76,7 +76,7 @@ else
|
||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if [ "$RUST_RELEASE_CHANNEL" = "nightly" ] or [ "$DIST_REQUIRE_ALL_TOOLS" = "" ]; then
|
if [ "$RUST_RELEASE_CHANNEL" = "nightly" ] || [ "$DIST_REQUIRE_ALL_TOOLS" = "" ]; then
|
||||||
RUST_CONFIGURE_ARGS="$RUST_CONFIGURE_ARGS --enable-missing-tools"
|
RUST_CONFIGURE_ARGS="$RUST_CONFIGURE_ARGS --enable-missing-tools"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue