Skip to content

Commit c349e6b

Browse files
committed
Set if-unchanged as the default value for download-ci-llvm when we're on CI.
1 parent 85ad75b commit c349e6b

File tree

1 file changed

+8
-1
lines changed

1 file changed

+8
-1
lines changed

Diff for: src/bootstrap/src/core/config/config.rs

+8-1
Original file line numberDiff line numberDiff line change
@@ -3094,7 +3094,14 @@ impl Config {
30943094
download_ci_llvm: Option<StringOrBool>,
30953095
asserts: bool,
30963096
) -> bool {
3097-
let download_ci_llvm = download_ci_llvm.unwrap_or(StringOrBool::Bool(true));
3097+
// We don't ever want to use `true` on CI, as we should not
3098+
// download upstream artifacts if there are any local modifications.
3099+
let default = if CiEnv::is_ci() {
3100+
StringOrBool::String("if-unchanged".to_string())
3101+
} else {
3102+
StringOrBool::Bool(true)
3103+
};
3104+
let download_ci_llvm = download_ci_llvm.unwrap_or(default);
30983105

30993106
let if_unchanged = || {
31003107
if self.rust_info.is_from_tarball() {

0 commit comments

Comments
 (0)