Skip to content

Commit e9f5aaa

Browse files
Mark-Simulacrumyoshuawuyts
authored andcommitted
Re-enable docs on try
1 parent a04c8a0 commit e9f5aaa

File tree

1 file changed

+0
-29
lines changed

1 file changed

+0
-29
lines changed

src/tools/opt-dist/src/main.rs

Lines changed: 0 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,6 @@ mod timer;
1717
mod training;
1818
mod utils;
1919

20-
fn is_try_build() -> bool {
21-
std::env::var("DIST_TRY_BUILD").unwrap_or_else(|_| "0".to_string()) != "0"
22-
}
23-
2420
fn execute_pipeline(
2521
env: &dyn Environment,
2622
timer: &mut Timer,
@@ -117,14 +113,6 @@ fn execute_pipeline(
117113
// The previous PGO optimized rustc build and PGO optimized LLVM builds should be reused.
118114
timer.section("Stage 4 (final build)", |stage| dist.run(stage))?;
119115

120-
// After dist has finished, run a subset of the test suite on the optimized artifacts to discover
121-
// possible regressions.
122-
// The tests are not executed for try builds, which can be in various broken states, so we don't
123-
// want to gatekeep them with tests.
124-
if !is_try_build() {
125-
timer.section("Run tests", |_| run_tests(env))?;
126-
}
127-
128116
Ok(())
129117
}
130118

@@ -146,23 +134,6 @@ fn main() -> anyhow::Result<()> {
146134
log::info!("Contents of `config.toml`:\n{config}");
147135
}
148136

149-
// Skip components that are not needed for try builds to speed them up
150-
if is_try_build() {
151-
log::info!("Skipping building of unimportant components for a try build");
152-
for target in [
153-
"rust-docs",
154-
"rustc-docs",
155-
"rust-docs-json",
156-
"rust-analyzer",
157-
"rustc-src",
158-
"clippy",
159-
"miri",
160-
"rustfmt",
161-
] {
162-
build_args.extend(["--exclude".to_string(), target.to_string()]);
163-
}
164-
}
165-
166137
let mut timer = Timer::new();
167138
let env = create_environment();
168139

0 commit comments

Comments
 (0)