From ecb474f4e92ced32d859d2bd390ddd470189654e Mon Sep 17 00:00:00 2001 From: jwiegratz Date: Sun, 17 Mar 2024 23:39:09 +0100 Subject: [PATCH] ci: consolidate rust-fmt into rust workflow --- .github/workflows/rust-fmt.yml | 18 ------------------ .github/workflows/rust.yml | 7 +++++++ 2 files changed, 7 insertions(+), 18 deletions(-) delete mode 100644 .github/workflows/rust-fmt.yml diff --git a/.github/workflows/rust-fmt.yml b/.github/workflows/rust-fmt.yml deleted file mode 100644 index d5ff0b8..0000000 --- a/.github/workflows/rust-fmt.yml +++ /dev/null @@ -1,18 +0,0 @@ -on: pull_request - -name: Rustfmt - -jobs: - format: - runs-on: ubuntu-latest - permissions: - pull-requests: write - steps: - - uses: actions/checkout@v4 - - uses: dtolnay/rust-toolchain@nightly - with: - components: rustfmt - - uses: mbrobbel/rustfmt-check@master - with: - token: ${{ secrets.GITHUB_TOKEN }} - mode: review diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml index 8cd8d8e..235959a 100644 --- a/.github/workflows/rust.yml +++ b/.github/workflows/rust.yml @@ -19,6 +19,13 @@ jobs: steps: - uses: actions/checkout@v4 + - uses: dtolnay/rust-toolchain@nightly + with: + components: rustfmt + - uses: mbrobbel/rustfmt-check@master + with: + token: ${{ secrets.GITHUB_TOKEN }} + mode: review - name: Run Clippy run: cargo clippy --all-targets --all-features - name: Build