bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Auto merge of #107704 - jyn514:tidy-ci, r=Mark-Simulacrum

Browse source 
Run `expand-yaml-anchors` in `x test tidy`

Previously, the pre-commit hook which runs `x test tidy` could pass only to have CI fail within the first 30 seconds. This adds about 30 seconds to `test tidy` (for an initial run, much less after the tool is built the first time) in exchange for catching errors in `.github/workflows/ci.yml` before they're pushed.
This commit is contained in:
bors 2023-02-07 09:58:58 +00:00
commit e4dd9edb76
2 changed files with 6 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/bootstrap/test.rs
View file

@ -1114,9 +1114,6 @@ impl Step for Tidy {
cmd.arg("--bless"); cmd.arg("--bless");
} }
builder.info("tidy check");
try_run(builder, &mut cmd);
if builder.config.channel == "dev" || builder.config.channel == "nightly" { if builder.config.channel == "dev" || builder.config.channel == "nightly" {
builder.info("fmt check"); builder.info("fmt check");
if builder.initial_rustfmt().is_none() { if builder.initial_rustfmt().is_none() {
@ -1134,6 +1131,11 @@ help: to skip test's attempt to check tidiness, pass `--exclude src/tools/tidy`
} }
crate::format::format(&builder, !builder.config.cmd.bless(), &[]); crate::format::format(&builder, !builder.config.cmd.bless(), &[]);
} }
builder.info("tidy check");
try_run(builder, &mut cmd);
builder.ensure(ExpandYamlAnchors {});
} }
fn should_run(run: ShouldRun<'_>) -> ShouldRun<'_> { fn should_run(run: ShouldRun<'_>) -> ShouldRun<'_> {

2
src/tools/expand-yaml-anchors/src/main.rs
View file

@ -51,7 +51,7 @@ impl App {
["generate", ref base] => (Mode::Generate, PathBuf::from(base)), ["generate", ref base] => (Mode::Generate, PathBuf::from(base)),
["check", ref base] => (Mode::Check, PathBuf::from(base)), ["check", ref base] => (Mode::Check, PathBuf::from(base)),
_ => { _ => {
eprintln!("usage: expand-yaml-anchors <source-dir> <dest-dir>"); eprintln!("usage: expand-yaml-anchors <generate|check> <base-dir>");
std::process::exit(1); std::process::exit(1);
} }
}; };