From 28ca187db6379c50adb335b30757e19f40d571c5 Mon Sep 17 00:00:00 2001
From: jtmoon79 <815261+jtmoon79@users.noreply.github.com>
Date: Sun, 28 May 2023 19:09:43 -0700
Subject: [PATCH] yamllint cleanup lint.yml test.yml
NFC fix most `yamllint` errors and warnings in
`lint.yml` and `test.yml`.
---
.github/workflows/lint.yml | 12 ++++++++----
.github/workflows/test.yml | 31 +++++++++++++++++++++++++------
2 files changed, 33 insertions(+), 10 deletions(-)
diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
index 9f52f477e4..8e5aac42c3 100644
--- a/.github/workflows/lint.yml
+++ b/.github/workflows/lint.yml
@@ -18,16 +18,20 @@ jobs:
- run: cargo fmt --check -- --color=always
- run: cargo fmt --check --manifest-path fuzz/Cargo.toml
- run: cargo clippy --color=always -- -D warnings
- - run: cargo clippy --color=always --target x86_64-pc-windows-msvc -- -D warnings
- - run: cargo clippy --manifest-path fuzz/Cargo.toml --color=always -- -D warnings
+ - run: |
+ cargo clippy --color=always --target x86_64-pc-windows-msvc \
+ -- -D warnings
+ - run: |
+ cargo clippy --manifest-path fuzz/Cargo.toml --color=always \
+ -- -D warnings
env:
RUSTFLAGS: "-Dwarnings"
cargo-deny:
runs-on: ubuntu-latest
steps:
- - uses: actions/checkout@v3
- - uses: EmbarkStudios/cargo-deny-action@v1
+ - uses: actions/checkout@v3
+ - uses: EmbarkStudios/cargo-deny-action@v1
check-doc:
runs-on: ubuntu-latest
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index a18e07aaf0..bdae3b5500 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -45,9 +45,18 @@ jobs:
with:
toolchain: 1.56.1
- uses: Swatinem/rust-cache@v2
- # run --lib and --doc to avoid the long running integration tests which are run elsewhere
- - run: cargo test --lib --features unstable-locales,wasmbind,oldtime,clock,rustc-serialize,winapi,serde --color=always -- --color=always
- - run: cargo test --doc --features unstable-locales,wasmbind,oldtime,clock,rustc-serialize,winapi,serde --color=always -- --color=always
+ # run --lib and --doc to avoid the long running integration tests
+ # which are run elsewhere
+ - run: |
+ cargo test --lib \
+ --features \
+ unstable-locales,wasmbind,oldtime,clock,rustc-serialize,winapi,serde \
+ --color=always -- --color=always
+ - run: |
+ cargo test --doc \
+ --features \
+ unstable-locales,wasmbind,oldtime,clock,rustc-serialize,winapi,serde \
+ --color=always -- --color=always
rust_versions:
strategy:
@@ -63,7 +72,8 @@ jobs:
- uses: Swatinem/rust-cache@v2
- run: cargo check --benches
- run: cargo check --manifest-path fuzz/Cargo.toml --all-targets
- # run --lib and --doc to avoid the long running integration tests which are run elsewhere
+ # run --lib and --doc to avoid the long running integration tests
+ # which are run elsewhere
- run: cargo test --lib --all-features --color=always -- --color=always
- run: cargo test --doc --all-features --color=always -- --color=always
@@ -77,7 +87,13 @@ jobs:
- uses: dtolnay/rust-toolchain@stable
- uses: taiki-e/install-action@cargo-hack
- uses: Swatinem/rust-cache@v2
- - run: cargo hack check --feature-powerset --optional-deps serde,rkyv --skip default --skip __internal_bench --skip __doctest --skip iana-time-zone --skip pure-rust-locales
+ - run: |
+ cargo hack check --feature-powerset --optional-deps serde,rkyv \
+ --skip default --skip __internal_bench --skip __doctest \
+ --skip iana-time-zone --skip pure-rust-locales
+ # run using `bash` on all platforms for consistent
+ # line-continuation marks
+ shell: bash
- run: cargo test --lib --no-default-features
- run: cargo test --doc --no-default-features
@@ -136,7 +152,10 @@ jobs:
targets: wasm32-unknown-unknown
- uses: taiki-e/install-action@cargo-hack
- uses: Swatinem/rust-cache@v2
- - run: cargo hack check --feature-powerset --optional-deps serde,rkyv --skip default --skip __internal_bench --skip __doctest --skip iana-time-zone --skip pure-rust-locales
+ - run: |
+ cargo hack check --feature-powerset --optional-deps serde,rkyv \
+ --skip default --skip __internal_bench --skip __doctest \
+ --skip iana-time-zone --skip pure-rust-locales
cross-targets:
strategy: