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

fix nested GHA groups (redux)

Browse Source
This commit is contained in:
jyn 2023-07-09 20:28:47 -05:00
parent fb3ac44dd8
commit df5cc59a68
1 changed files with 6 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/bootstrap/test.rs
View File

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