aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar bors[bot] <26634292+bors[bot]@users.noreply.github.com> 2023-03-15 19:48:33 +0000
committerGravatar GitHub <noreply@github.com> 2023-03-15 19:48:33 +0000
commit3a0e2ac92438c818f7f12d894c576de9af9fcc01 (patch)
tree9e75420426ca639a4e3ecd362ce4a1633c02ee1d
parentd18955a13450257c0a7725130beef44f21217138 (diff)
parent0b88c26f3fa73c566a687b34f80c4f84aee4773e (diff)
downloadrtic-3a0e2ac92438c818f7f12d894c576de9af9fcc01.tar.gz
rtic-3a0e2ac92438c818f7f12d894c576de9af9fcc01.tar.zst
rtic-3a0e2ac92438c818f7f12d894c576de9af9fcc01.zip
Merge #706
706: ci/tuneverboselevel r=korken89 a=AfoHT - xtask: Change default loglevel - xtask: Fix cargo fmt logmsg - ci: xtask default verbosity Co-authored-by: Henrik Tjäder <henrik@tjaders.com>
-rw-r--r--.github/workflows/build.yml12
-rw-r--r--xtask/src/main.rs9
2 files changed, 10 insertions, 11 deletions
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index e84de651..aadb0a97 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:
diff --git a/xtask/src/main.rs b/xtask/src/main.rs
index aed74eb5..a7fd1d32 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)
@@ -188,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)?;
}