mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

do not check incompatibility if config.toml isn't present

Browse Source 
Signed-off-by: onur-ozkan <work@onurozkan.dev>
This commit is contained in:
onur-ozkan 2024-08-14 08:06:50 +03:00
parent b76f6a3b1a
commit 43320d5d6c
1 changed files with 18 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
src/bootstrap/src/core/config/config.rs
View File

@ -2320,27 +2320,29 @@ impl Config {
Some(commit) => {
self.download_ci_rustc(commit);
let builder_config_path =
self.out.join(self.build.triple).join("ci-rustc/builder-config");
let ci_config_toml = Self::get_toml(&builder_config_path);
let current_config_toml = Self::get_toml(self.config.as_ref().unwrap());
if let Some(config_path) = &self.config {
let builder_config_path =
self.out.join(self.build.triple).join("ci-rustc/builder-config");
let ci_config_toml = Self::get_toml(&builder_config_path);
let current_config_toml = Self::get_toml(config_path);
// Check the config compatibility
let res = check_incompatible_options_for_ci_rustc(
current_config_toml,
ci_config_toml,
);
// Check the config compatibility
let res = check_incompatible_options_for_ci_rustc(
current_config_toml,
ci_config_toml,
);
let disable_ci_rustc_if_incompatible =
env::var_os("DISABLE_CI_RUSTC_IF_INCOMPATIBLE")
let disable_ci_rustc_if_incompatible =
env::var_os("DISABLE_CI_RUSTC_IF_INCOMPATIBLE")
.is_some_and(|s| s == "1" || s == "true");
if disable_ci_rustc_if_incompatible && res.is_err() {
println!("WARNING: download-rustc is disabled with `DISABLE_CI_RUSTC_IF_INCOMPATIBLE` env.");
return None;
}
if disable_ci_rustc_if_incompatible && res.is_err() {
println!("WARNING: download-rustc is disabled with `DISABLE_CI_RUSTC_IF_INCOMPATIBLE` env.");
return None;
}
res.unwrap();
res.unwrap();
}
Some(commit.clone())
}