fix nested GHA groups (redux)

This commit is contained in:
jyn 2023-07-09 20:28:47 -05:00
parent fb3ac44dd8
commit df5cc59a68

View File

@ -1893,14 +1893,6 @@ fn should_run(run: ShouldRun<'_>) -> ShouldRun<'_> {
///
/// This uses the `rustdoc` that sits next to `compiler`.
fn run(self, builder: &Builder<'_>) {
let host = self.compiler.host;
let _guard = builder.msg(
Kind::Test,
self.compiler.stage,
&format!("book {}", self.name),
host,
host,
);
// External docs are different from local because:
// - Some books need pre-processing by mdbook before being tested.
// - They need to save their state to toolstate.
@ -1943,7 +1935,7 @@ fn run_ext_doc(self, builder: &Builder<'_>) {
let _guard = builder.msg(
Kind::Test,
compiler.stage,
format_args!("rustbook {}", self.path.display()),
format_args!("mdbook {}", self.path.display()),
compiler.host,
compiler.host,
);
@ -1959,8 +1951,12 @@ fn run_ext_doc(self, builder: &Builder<'_>) {
/// This runs `rustdoc --test` on all `.md` files in the path.
fn run_local_doc(self, builder: &Builder<'_>) {
let compiler = self.compiler;
let host = self.compiler.host;
builder.ensure(compile::Std::new(compiler, compiler.host));
builder.ensure(compile::Std::new(compiler, host));
let _guard =
builder.msg(Kind::Test, compiler.stage, &format!("book {}", self.name), host, host);
// Do a breadth-first traversal of the `src/doc` directory and just run
// tests for all files that end in `*.md`