From 96aa385b556450a9af125fec6a9d0ae74907c2ce Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Henrik=20Tj=C3=A4der?= Date: Wed, 15 Mar 2023 20:32:39 +0100 Subject: [PATCH 1/3] xtask: Change default loglevel --- xtask/src/main.rs | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/xtask/src/main.rs b/xtask/src/main.rs index aed74eb55e..35e2a01615 100644 --- a/xtask/src/main.rs +++ b/xtask/src/main.rs @@ -109,9 +109,8 @@ fn main() -> anyhow::Result<()> { let cli = Cli::parse(); let env_logger_default_level = match cli.verbose { - 0 => Env::default().default_filter_or("error"), - 1 => Env::default().default_filter_or("info"), - 2 => Env::default().default_filter_or("debug"), + 0 => Env::default().default_filter_or("info"), + 1 => Env::default().default_filter_or("debug"), _ => Env::default().default_filter_or("trace"), }; env_logger::Builder::from_env(env_logger_default_level) From 88b435c2f8f0d41325eb5540fed156b7d3380c98 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Henrik=20Tj=C3=A4der?= Date: Wed, 15 Mar 2023 20:32:58 +0100 Subject: [PATCH 2/3] xtask: Fix cargo fmt logmsg --- xtask/src/main.rs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/xtask/src/main.rs b/xtask/src/main.rs index 35e2a01615..a7fd1d3229 100644 --- a/xtask/src/main.rs +++ b/xtask/src/main.rs @@ -187,12 +187,12 @@ fn main() -> anyhow::Result<()> { match cli.command { Commands::FormatCheck(args) => { - info!("Running cargo fmt: {args:?}"); + info!("Running cargo fmt --check: {args:?}"); let check_only = true; cargo_format(&cargologlevel, &args, check_only)?; } Commands::Format(args) => { - info!("Running cargo fmt --check: {args:?}"); + info!("Running cargo fmt: {args:?}"); let check_only = false; cargo_format(&cargologlevel, &args, check_only)?; } From 0b88c26f3fa73c566a687b34f80c4f84aee4773e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Henrik=20Tj=C3=A4der?= Date: Wed, 15 Mar 2023 20:43:51 +0100 Subject: [PATCH 3/3] ci: xtask default verbosity --- .github/workflows/build.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 300bea51b7..d4c78cf85d 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -68,7 +68,7 @@ jobs: - name: Cache Dependencies uses: Swatinem/rust-cache@v2 - - run: cargo xtask --verbose --backend ${{ matrix.backend }} check + - run: cargo xtask --backend ${{ matrix.backend }} check # Clippy clippy: @@ -107,7 +107,7 @@ jobs: - name: Cache Dependencies uses: Swatinem/rust-cache@v2 - - run: cargo xtask --verbose --backend ${{ matrix.backend }} clippy + - run: cargo xtask --backend ${{ matrix.backend }} clippy # Verify all examples, checks checkexamples: @@ -142,11 +142,11 @@ jobs: - name: Check the examples if: ${{ matrix.backend == 'thumbv8-base' }} - run: cargo xtask --verbose --backend ${{ matrix.backend }} --exampleexclude pool example-check + run: cargo xtask --backend ${{ matrix.backend }} --exampleexclude pool example-check - name: Check the examples if: ${{ matrix.backend != 'thumbv8-base' }} - run: cargo xtask --verbose --backend ${{ matrix.backend }} example-check + run: cargo xtask --backend ${{ matrix.backend }} example-check # Verify the example output with run-pass tests testexamples: @@ -195,7 +195,7 @@ jobs: run: sed -i 's,//deny_warnings_placeholder_for_ci,#![deny(warnings)],' src/lib.rs - name: Run-pass tests - run: cargo xtask --verbose --backend ${{ matrix.backend }} qemu + run: cargo xtask --backend ${{ matrix.backend }} qemu # Run test suite tests: @@ -235,7 +235,7 @@ jobs: run: find . -type f -name lib.rs -execdir sed -i 's,//deny_warnings_placeholder_for_ci,#![deny(warnings)],' {} + - name: Run cargo test - run: cargo xtask --verbose --backend ${{ matrix.backend }} test ${{ matrix.package }} + run: cargo xtask --backend ${{ matrix.backend }} test ${{ matrix.package }} # Build documentation, check links docs: