Skip to content

Commit 5122e88

Browse files
authored
Rollup merge of #113034 - jyn514:ci-progress, r=oli-obk
Switch some more Steps to `builder.msg` In particular, this hides compiletest suites under a dropdown - some builders are configured with `verbose-tests`, which makes the suites take up many thousands of lines. before: ``` Documenting stage1 cargo (x86_64-unknown-linux-gnu) Check compiletest suite=rustdoc-js mode=js-doc-test (x86_64-unknown-linux-gnu -> x86_64-unknown-linux-gnu) ``` after: ``` ::group::Documenting stage1 cargo (x86_64-unknown-linux-gnu) ::group::Testing stage1 compiletest suite=rustdoc-js mode=js-doc-test (x86_64-unknown-linux-gnu) ``` found this from https://github.com/rust-lang-ci/rust/actions/runs/5366993848/jobs/9736792611 r? `@oli-obk`
2 parents 005d860 + bd36f63 commit 5122e88

File tree

3 files changed

+20
-16
lines changed

3 files changed

+20
-16
lines changed

src/bootstrap/doc.rs

+4-11
Original file line numberDiff line numberDiff line change
@@ -222,7 +222,7 @@ impl Step for TheBook {
222222
let shared_assets = builder.ensure(SharedAssets { target });
223223

224224
// build the redirect pages
225-
builder.info(&format!("Documenting book redirect pages ({})", target));
225+
builder.msg_doc(compiler, "book redirect pages", target);
226226
for file in t!(fs::read_dir(builder.src.join(&relative_path).join("redirects"))) {
227227
let file = t!(file);
228228
let path = file.path();
@@ -306,7 +306,7 @@ impl Step for Standalone {
306306
fn run(self, builder: &Builder<'_>) {
307307
let target = self.target;
308308
let compiler = self.compiler;
309-
builder.info(&format!("Documenting standalone ({})", target));
309+
builder.msg_doc(compiler, "standalone", target);
310310
let out = builder.doc_out(target);
311311
t!(fs::create_dir_all(&out));
312312

@@ -562,7 +562,7 @@ fn doc_std(
562562

563563
let description =
564564
format!("library{} in {} format", crate_description(&requested_crates), format.as_str());
565-
let _guard = builder.msg(Kind::Doc, stage, &description, compiler.host, target);
565+
let _guard = builder.msg_doc(compiler, &description, target);
566566

567567
let target_doc_dir_name = if format == DocumentationFormat::JSON { "json-doc" } else { "doc" };
568568
let target_dir =
@@ -804,14 +804,7 @@ macro_rules! tool_doc {
804804
SourceType::Submodule
805805
};
806806

807-
builder.info(
808-
&format!(
809-
"Documenting stage{} {} ({})",
810-
stage,
811-
stringify!($tool).to_lowercase(),
812-
target,
813-
),
814-
);
807+
builder.msg_doc(compiler, stringify!($tool).to_lowercase(), target);
815808

816809
// Symlink compiler docs to the output directory of rustdoc documentation.
817810
let out_dirs = [

src/bootstrap/lib.rs

+9
Original file line numberDiff line numberDiff line change
@@ -1009,6 +1009,15 @@ impl Build {
10091009
self.msg(Kind::Check, self.config.stage, what, self.config.build, target)
10101010
}
10111011

1012+
fn msg_doc(
1013+
&self,
1014+
compiler: Compiler,
1015+
what: impl Display,
1016+
target: impl Into<Option<TargetSelection>> + Copy,
1017+
) -> Option<gha::Group> {
1018+
self.msg(Kind::Doc, compiler.stage, what, compiler.host, target.into())
1019+
}
1020+
10121021
fn msg_build(
10131022
&self,
10141023
compiler: Compiler,

src/bootstrap/test.rs

+7-5
Original file line numberDiff line numberDiff line change
@@ -1832,11 +1832,13 @@ note: if you're sure you want to do this, please open an issue as to why. In the
18321832
builder,
18331833
);
18341834

1835-
builder.info(&format!(
1836-
"Check compiletest suite={} mode={} ({} -> {})",
1837-
suite, mode, &compiler.host, target
1838-
));
1839-
let _time = util::timeit(&builder);
1835+
let _group = builder.msg(
1836+
Kind::Test,
1837+
compiler.stage,
1838+
&format!("compiletest suite={suite} mode={mode}"),
1839+
compiler.host,
1840+
target,
1841+
);
18401842
crate::render_tests::try_run_tests(builder, &mut cmd, false);
18411843

18421844
if let Some(compare_mode) = compare_mode {

0 commit comments

Comments
 (0)