mirror of
https://github.com/ClementTsang/bottom
synced 2024-11-25 05:30:22 +00:00
ci: move cargo fmt step into supported job (#722)
Moves the rustfmt step into the supported job, to avoid having to wait too long for machine spinup time if they are separate jobs.
This commit is contained in:
parent
2629709c5d
commit
9882a9bd08
1 changed files with 6 additions and 37 deletions
43
.github/workflows/ci.yml
vendored
43
.github/workflows/ci.yml
vendored
|
@ -24,42 +24,8 @@ env:
|
||||||
CARGO_HUSKY_DONT_INSTALL_HOOKS: true
|
CARGO_HUSKY_DONT_INSTALL_HOOKS: true
|
||||||
|
|
||||||
jobs:
|
jobs:
|
||||||
rustfmt:
|
# Runs rustfmt + tests + clippy on the main supported platforms.
|
||||||
runs-on: ${{ matrix.os }}
|
|
||||||
strategy:
|
|
||||||
fail-fast: false
|
|
||||||
matrix:
|
|
||||||
os:
|
|
||||||
- ubuntu-latest
|
|
||||||
- macOS-latest
|
|
||||||
- windows-2019
|
|
||||||
steps:
|
|
||||||
- name: Check if this action should be skipped
|
|
||||||
id: skip_check
|
|
||||||
uses: fkirc/skip-duplicate-actions@38c3738dcac87b41e2b7038775457756c793566e # https://github.com/fkirc/skip-duplicate-actions/commit/38c3738dcac87b41e2b7038775457756c793566e
|
|
||||||
with:
|
|
||||||
concurrent_skipping: "same_content_newer"
|
|
||||||
skip_after_successful_duplicate: "true"
|
|
||||||
paths: '[".cargo/**", ".github/workflows/ci.yml", "sample_configs/**", "src/**", "tests/**", "build.rs", "Cargo.lock", "Cargo.toml", "clippy.toml", "rustfmt.toml"]'
|
|
||||||
do_not_skip: '["workflow_dispatch", "push"]'
|
|
||||||
|
|
||||||
- uses: actions/checkout@v2
|
|
||||||
if: ${{ steps.skip_check.outputs.should_skip != 'true' }}
|
|
||||||
|
|
||||||
- uses: actions-rs/toolchain@88dc2356392166efad76775c878094f4e83ff746 # https://github.com/actions-rs/toolchain/commit/88dc2356392166efad76775c878094f4e83ff746
|
|
||||||
if: ${{ steps.skip_check.outputs.should_skip != 'true' }}
|
|
||||||
with:
|
|
||||||
profile: minimal
|
|
||||||
toolchain: stable
|
|
||||||
override: true
|
|
||||||
components: rustfmt
|
|
||||||
|
|
||||||
- run: cargo fmt --all -- --check
|
|
||||||
if: ${{ steps.skip_check.outputs.should_skip != 'true' }}
|
|
||||||
|
|
||||||
# Runs tests + clippy on the main supported platforms.
|
|
||||||
supported:
|
supported:
|
||||||
needs: [rustfmt]
|
|
||||||
runs-on: ${{ matrix.triple.os }}
|
runs-on: ${{ matrix.triple.os }}
|
||||||
strategy:
|
strategy:
|
||||||
fail-fast: false
|
fail-fast: false
|
||||||
|
@ -107,12 +73,16 @@ jobs:
|
||||||
profile: minimal
|
profile: minimal
|
||||||
toolchain: stable
|
toolchain: stable
|
||||||
override: true
|
override: true
|
||||||
components: clippy
|
components: rustfmt, clippy
|
||||||
|
|
||||||
- name: Enable Rust cache
|
- name: Enable Rust cache
|
||||||
if: ${{ steps.skip_check.outputs.should_skip != 'true' }}
|
if: ${{ steps.skip_check.outputs.should_skip != 'true' }}
|
||||||
uses: Swatinem/rust-cache@cb2cf0cc7c5198d3364b9630e2c3d457f160790c # 1.4.0
|
uses: Swatinem/rust-cache@cb2cf0cc7c5198d3364b9630e2c3d457f160790c # 1.4.0
|
||||||
|
|
||||||
|
- name: Check cargo fmt
|
||||||
|
if: ${{ steps.skip_check.outputs.should_skip != 'true' }}
|
||||||
|
run: cargo fmt --all -- --check
|
||||||
|
|
||||||
- name: Build tests
|
- name: Build tests
|
||||||
if: ${{ steps.skip_check.outputs.should_skip != 'true' }}
|
if: ${{ steps.skip_check.outputs.should_skip != 'true' }}
|
||||||
run: cargo test --no-run --locked ${{ matrix.features }}
|
run: cargo test --no-run --locked ${{ matrix.features }}
|
||||||
|
@ -131,7 +101,6 @@ jobs:
|
||||||
|
|
||||||
# Run cargo check on all other platforms
|
# Run cargo check on all other platforms
|
||||||
other_check:
|
other_check:
|
||||||
needs: [rustfmt]
|
|
||||||
runs-on: ${{ matrix.triple.os }}
|
runs-on: ${{ matrix.triple.os }}
|
||||||
continue-on-error: true
|
continue-on-error: true
|
||||||
strategy:
|
strategy:
|
||||||
|
|
Loading…
Reference in a new issue