user0/rust
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Auto merge of #146771 - Kobzol:download-ci-llvm-default-value, r=jieyouxu

Browse source 
Simplify default value of `download-ci-llvm`

Just set it to true, rather than having different default values on CI and locally, and then only deny `true` on our own CI, not elsewhere.

Closes: https://github.com/rust-lang/rust/issues/146768

r? `@jieyouxu`
This commit is contained in:
bors 2025-09-20 08:04:38 +00:00
commit b00998aaa5
1 changed files with 4 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

15
src/bootstrap/src/core/config/config.rs
View file

@ -2137,15 +2137,7 @@ pub fn parse_download_ci_llvm<'a>(
asserts: bool,
) -> bool {
let dwn_ctx = dwn_ctx.as_ref();
// We don't ever want to use `true` on CI, as we should not
// download upstream artifacts if there are any local modifications.
let default = if dwn_ctx.is_running_on_ci {
StringOrBool::String("if-unchanged".to_string())
} else {
StringOrBool::Bool(true)
};
let download_ci_llvm = download_ci_llvm.unwrap_or(default);
let download_ci_llvm = download_ci_llvm.unwrap_or(StringOrBool::Bool(true));
let if_unchanged = || {
if rust_info.is_from_tarball() {
@ -2177,8 +2169,9 @@ pub fn parse_download_ci_llvm<'a>(
);
}
if b && dwn_ctx.is_running_on_ci {
// On CI, we must always rebuild LLVM if there were any modifications to it
#[cfg(not(test))]
if b && dwn_ctx.is_running_on_ci && CiEnv::is_rust_lang_managed_ci_job() {
// On rust-lang CI, we must always rebuild LLVM if there were any modifications to it
panic!(
"`llvm.download-ci-llvm` cannot be set to `true` on CI. Use `if-unchanged` instead."
);