Skip to content

Commit f53acd1

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

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
@@ -3097,7 +3097,14 @@ impl Config {
30973097
download_ci_llvm: Option<StringOrBool>,
30983098
asserts: bool,
30993099
) -> bool {
3100-
let download_ci_llvm = download_ci_llvm.unwrap_or(StringOrBool::Bool(true));
3100+
// We don't ever want to use `true` on CI, as we should not
3101+
// download upstream artifacts if there are any local modifications.
3102+
let default = if self.is_running_on_ci {
3103+
StringOrBool::String("if-unchanged".to_string())
3104+
} else {
3105+
StringOrBool::Bool(true)
3106+
};
3107+
let download_ci_llvm = download_ci_llvm.unwrap_or(default);
31013108

31023109
let if_unchanged = || {
31033110
if self.rust_info.is_from_tarball() {

0 commit comments

Comments
 (0)