diff options
| author | 魏曹先生 <1992414357@qq.com> | 2026-08-18 11:09:23 +0800 |
|---|---|---|
| committer | 魏曹先生 <1992414357@qq.com> | 2026-08-18 11:09:23 +0800 |
| commit | b1102be2682feb2d2182ead0fcc7ce12f8d0c865 (patch) | |
| tree | 6bb68f2a79600aa1144d05394b89de9286d385c9 | |
| parent | 65464029958facf58c886a3ab5d4b9ab176f4e1c (diff) | |
refactor(mingling_ci): rename build, clippy, and docs commands to -check
suffix
| -rw-r--r-- | mingling_ci/help.txt | 8 | ||||
| -rw-r--r-- | mingling_ci/src/cmd.rs | 2 | ||||
| -rw-r--r-- | mingling_ci/src/task.rs | 7 | ||||
| -rw-r--r-- | mingling_ci/src/task/cmd_build_check.rs (renamed from mingling_ci/src/task/cmd_build.rs) | 12 | ||||
| -rw-r--r-- | mingling_ci/src/task/cmd_clippy_check.rs (renamed from mingling_ci/src/task/cmd_clippy.rs) | 12 | ||||
| -rw-r--r-- | mingling_ci/src/task/cmd_docs_check.rs (renamed from mingling_ci/src/cmd/cmd_docs_build.rs) | 12 | ||||
| -rw-r--r-- | mingling_ci/src/task/cmd_example_check.rs (renamed from mingling_ci/src/cmd/cmd_test_examples.rs) | 12 |
7 files changed, 33 insertions, 32 deletions
diff --git a/mingling_ci/help.txt b/mingling_ci/help.txt index de85c89..9d80d2f 100644 --- a/mingling_ci/help.txt +++ b/mingling_ci/help.txt @@ -19,8 +19,8 @@ COMMANDS: markdown-check-all Verify rust code blocks in all configured markdown files markdown-compare <PATH> <PATH> Compare the structure of two markdown files/dirs markdown-compare-all Compare all translated docs against the reference - build-all Build all crates - clippy-all Run clippy with -D warnings on all crates + build-check Build all crates + clippy-check Run clippy with -D warnings on all crates test-all Test all crates - test-examples Build examples and run their test.toml cases - docs-build Build mingling docs with -D warnings + example-check Build examples and run their test.toml cases + docs-check Build mingling docs with -D warnings diff --git a/mingling_ci/src/cmd.rs b/mingling_ci/src/cmd.rs index 3b057af..30d65a1 100644 --- a/mingling_ci/src/cmd.rs +++ b/mingling_ci/src/cmd.rs @@ -1,6 +1,4 @@ -pub(crate) mod cmd_docs_build; pub(crate) mod cmd_report_clean; pub(crate) mod cmd_report_collect; pub(crate) mod cmd_show_features; pub(crate) mod cmd_show_manifests; -pub(crate) mod cmd_test_examples; diff --git a/mingling_ci/src/task.rs b/mingling_ci/src/task.rs index 92660bb..a42e458 100644 --- a/mingling_ci/src/task.rs +++ b/mingling_ci/src/task.rs @@ -1,6 +1,9 @@ -pub(crate) mod cmd_build; -pub(crate) mod cmd_clippy; +pub(crate) mod cmd_build_check; +pub(crate) mod cmd_clippy_check; +pub(crate) mod cmd_docs_check; +pub(crate) mod cmd_example_check; pub(crate) mod cmd_markdown_check; pub(crate) mod cmd_markdown_compare; pub(crate) mod cmd_test; pub(crate) mod run; + diff --git a/mingling_ci/src/task/cmd_build.rs b/mingling_ci/src/task/cmd_build_check.rs index f37699c..f67fe2e 100644 --- a/mingling_ci/src/task/cmd_build.rs +++ b/mingling_ci/src/task/cmd_build_check.rs @@ -11,15 +11,15 @@ use crate::Next; use crate::res::Manifests; use crate::task::run::{location, run_parallel_checks}; -#[command(node = "build-all")] -pub async fn build_all(manifests: &Manifests) -> Next { +#[command(node = "build-check")] +pub async fn build_check(manifests: &Manifests) -> Next { let tasks = manifests .package_dirs .iter() .map(|(name, path)| (name.clone(), location(path), build_args(path))) .collect(); - let fail_count = run_parallel_checks("Build-All", "Building", tasks).await; - ResultBuildAll { fail_count }.to_chain() + let fail_count = run_parallel_checks("Build-Check", "Building", tasks).await; + ResultBuildCheck { fail_count }.to_chain() } /// `cargo build --manifest-path <path>` @@ -34,13 +34,13 @@ fn build_args(path: &Path) -> Vec<OsString> { /// Number of packages that failed to build. #[derive(Grouped)] -pub struct ResultBuildAll { +pub struct ResultBuildCheck { pub fail_count: usize, } /// Silently sets a non-zero exit code when any build failed. #[renderer(buffer)] -pub fn render_build_all(r: ResultBuildAll, exit_code: &mut ResExitCode) { +pub fn render_build_check(r: ResultBuildCheck, exit_code: &mut ResExitCode) { if r.fail_count > 0 { exit_code.exit_code = 1; } diff --git a/mingling_ci/src/task/cmd_clippy.rs b/mingling_ci/src/task/cmd_clippy_check.rs index 7256bef..a0dd46e 100644 --- a/mingling_ci/src/task/cmd_clippy.rs +++ b/mingling_ci/src/task/cmd_clippy_check.rs @@ -11,15 +11,15 @@ use crate::Next; use crate::res::Manifests; use crate::task::run::{location, run_parallel_checks}; -#[command(node = "clippy-all")] -pub async fn clippy_all(manifests: &Manifests) -> Next { +#[command(node = "clippy-check")] +pub async fn clippy_check(manifests: &Manifests) -> Next { let tasks = manifests .package_dirs .iter() .map(|(name, path)| (name.clone(), location(path), clippy_args(path))) .collect(); - let fail_count = run_parallel_checks("Clippy-All", "Clippy", tasks).await; - ResultClippyAll { fail_count }.to_chain() + let fail_count = run_parallel_checks("Clippy-Check", "Clippy", tasks).await; + ResultClippyCheck { fail_count }.to_chain() } /// `cargo clippy --manifest-path <path> -- -D warnings` @@ -37,13 +37,13 @@ fn clippy_args(path: &Path) -> Vec<OsString> { /// Number of packages that failed clippy. #[derive(Grouped)] -pub struct ResultClippyAll { +pub struct ResultClippyCheck { pub fail_count: usize, } /// Silently sets a non-zero exit code when any clippy check failed. #[renderer(buffer)] -pub fn render_clippy_all(r: ResultClippyAll, exit_code: &mut ResExitCode) { +pub fn render_clippy_check(r: ResultClippyCheck, exit_code: &mut ResExitCode) { if r.fail_count > 0 { exit_code.exit_code = 1; } diff --git a/mingling_ci/src/cmd/cmd_docs_build.rs b/mingling_ci/src/task/cmd_docs_check.rs index fe74419..3a77d4d 100644 --- a/mingling_ci/src/cmd/cmd_docs_build.rs +++ b/mingling_ci/src/task/cmd_docs_check.rs @@ -10,8 +10,8 @@ use crate::Next; use crate::res::ResFeatureList; use crate::task::run::run_parallel_checks; -#[command(node = "docs-build")] -pub async fn docs_build(features: &ResFeatureList) -> Next { +#[command(node = "docs-check")] +pub async fn docs_check(features: &ResFeatureList) -> Next { let args = vec![ OsString::from("cargo"), OsString::from("rustdoc"), @@ -24,20 +24,20 @@ pub async fn docs_build(features: &ResFeatureList) -> Next { OsString::from("warnings"), ]; let tasks = vec![("mingling".to_string(), "./mingling".to_string(), args)]; - let fail_count = run_parallel_checks("Docs-Build", "Docs", tasks).await; + let fail_count = run_parallel_checks("Docs-Check", "Docs", tasks).await; - ResultDocsBuild { fail_count }.to_chain() + ResultDocsCheck { fail_count }.to_chain() } /// Number of failed doc builds (0 or 1). #[derive(Grouped)] -pub struct ResultDocsBuild { +pub struct ResultDocsCheck { pub fail_count: usize, } /// Silently sets a non-zero exit code when the doc build failed. #[renderer(buffer)] -pub fn render_docs_build(r: ResultDocsBuild, exit_code: &mut ResExitCode) { +pub fn render_docs_check(r: ResultDocsCheck, exit_code: &mut ResExitCode) { if r.fail_count > 0 { exit_code.exit_code = 1; } diff --git a/mingling_ci/src/cmd/cmd_test_examples.rs b/mingling_ci/src/task/cmd_example_check.rs index 602ada3..1b9f440 100644 --- a/mingling_ci/src/cmd/cmd_test_examples.rs +++ b/mingling_ci/src/task/cmd_example_check.rs @@ -10,9 +10,9 @@ use crate::examples::{check_example, load_test_configs}; use crate::progress::task_progress_bar; use crate::reporter::{self, ReportResult}; -#[command(node = "test-examples")] -pub async fn test_examples() -> Next { - reporter::set_task("Test-Examples"); +#[command(node = "example-check")] +pub async fn example_check() -> Next { + reporter::set_task("Example-Check"); let configs = load_test_configs(); let total = configs.len(); @@ -51,18 +51,18 @@ pub async fn test_examples() -> Next { pb.finish_and_clear(); reporter::flush(); - ResultTestExamples { fail_count }.to_chain() + ResultExampleCheck { fail_count }.to_chain() } /// Number of examples that failed to build or pass their tests. #[derive(Grouped)] -pub struct ResultTestExamples { +pub struct ResultExampleCheck { pub fail_count: usize, } /// Silently sets a non-zero exit code when any example failed. #[renderer(buffer)] -pub fn render_test_examples(r: ResultTestExamples, exit_code: &mut ResExitCode) { +pub fn render_example_check(r: ResultExampleCheck, exit_code: &mut ResExitCode) { if r.fail_count > 0 { exit_code.exit_code = 1; } |
