Skip to content

don't panic for incompatible download-rustc options outside of CI env #142054

New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

#

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

Closed
wants to merge 1 commit into from
Closed

don't panic for incompatible download-rustc options outside of CI env #142054

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 8 additions & 1 deletion src/bootstrap/src/core/config/config.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2823,7 +2823,14 @@ impl Config {
return None;
}

res.unwrap();
// On CI, avoid using download-rustc if the configuration differs from the one used to build download-rustc.
// We typically use `DISABLE_CI_RUSTC_IF_INCOMPATIBLE` to skip download-rustc in such cases.
if CiEnv::is_ci() {
res.unwrap();
} else if let Err(err) = res {
// For non-CI environments, print the error instead of panicking.
eprintln!("{err}");
}
}

Some(commit.clone())
Expand Down
Loading