Skip to content

detect incompatible CI rustc options more precisely #129052

New issue

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

Sign up for GitHub

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

Already on GitHub? Sign in to your account

Merged
bors merged 10 commits into from
Aug 16, 2024
Merged

detect incompatible CI rustc options more precisely #129052

Changes from 1 commit
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
aba675f
copy `builder-config` file into ci-rustc sysroot
onur-ozkan Aug 13, 2024
b2f1fc1
separate inner function (`get_toml`) of `Config::parse`
onur-ozkan Aug 13, 2024
0518e8c
detect incompatible CI rustc options more precisely
onur-ozkan Aug 13, 2024
b76f6a3
print values of incompatible options
onur-ozkan Aug 14, 2024
43320d5
do not check incompatibility if `config.toml` isn't present
onur-ozkan Aug 14, 2024
4d21c73
create `const BUILDER_CONFIG_FILENAME` for builder-config file
onur-ozkan Aug 14, 2024
4d13470
fix the incorrect `unpack`ing logic
onur-ozkan Aug 14, 2024
151e8cd
improve `config::check_incompatible_options_for_ci_rustc` logs
onur-ozkan Aug 14, 2024
0935c86
leave a FIXME note for `--set` flags coverage
onur-ozkan Aug 14, 2024
469d593
disable download-rustc if CI rustc has unsupported options
onur-ozkan Aug 14, 2024
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
11 changes: 7 additions & 4 deletions src/bootstrap/src/core/download.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -273,11 +273,12 @@ impl Config {

let mut tar = tar::Archive::new(decompressor);

let is_ci_rustc = dst.ends_with("ci-rustc");

// `compile::Sysroot` needs to know the contents of the `rustc-dev` tarball to avoid adding
// it to the sysroot unless it was explicitly requested. But parsing the 100 MB tarball is slow.
// Cache the entries when we extract it so we only have to read it once.
let mut recorded_entries =
if dst.ends_with("ci-rustc") { recorded_entries(dst, pattern) } else { None };
let mut recorded_entries = if is_ci_rustc { recorded_entries(dst, pattern) } else { None };

for member in t!(tar.entries()) {
let mut member = t!(member);
Expand All @@ -287,10 +288,12 @@ impl Config {
continue;
}
let mut short_path = t!(original_path.strip_prefix(directory_prefix));
if !short_path.starts_with(pattern) {
let is_builder_config = short_path.to_str() == Some("builder-config");

if !short_path.starts_with(pattern) && (is_ci_rustc && !is_builder_config) {
continue;
}
short_path = t!(short_path.strip_prefix(pattern));
short_path = short_path.strip_prefix(pattern).unwrap_or(short_path);
let dst_path = dst.join(short_path);
self.verbose(|| {
println!("extracting {} to {}", original_path.display(), dst.display())
Expand Down