ci: consolidate rust-fmt into rust workflow

namib-project · Mar 17, 2024 · b6720b8 · b6720b8
1 parent 487e89a
commit b6720b8
Show file tree

Hide file tree

Showing 2 changed files with 29 additions and 29 deletions.
diff --git a/.github/workflows/rust-fmt.yml b/.github/workflows/rust-fmt.yml
diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml
@@ -13,17 +13,35 @@ env:
  RUSTFLAGS: "-Dwarnings"
 
 jobs:
+ clippy:
+ name: Clippy
+ runs-on: ubuntu-latest
+ steps:
+ - uses: dtolnay/rust-toolchain@nightly
+ with:
+ components: clippy
+ - name: Run Clippy
+ run: cargo clippy --all-targets --all-features
+ fmt:
+ name: Rustfmt
+ runs-on: ubuntu-latest
+ permissions:
+ pull-requests: write
+ steps:
+ - uses: dtolnay/rust-toolchain@nightly
+ with:
+ components: rustfmt
+ - uses: mbrobbel/rustfmt-check@master
+ with:
+ token: ${{ secrets.GITHUB_TOKEN }}
+ mode: review
  build:
-
  runs-on: ubuntu-latest
-
  steps:
- - uses: actions/checkout@v4
- - name: Run Clippy
- run: cargo clippy --all-targets --all-features
- - name: Build
- run: cargo build --verbose
- - name: Run tests
- run: cargo test --verbose
- - name: Run tests (rootful)
- run: sudo -E env "PATH=$PATH" bash tests/run_nft_tests.sh
+ - uses: actions/checkout@v4
+ - name: Build
+ run: cargo build --verbose
+ - name: Run tests
+ run: cargo test --verbose
+ - name: Run tests (rootful)
+ run: sudo -E env "PATH=$PATH" bash tests/run_nft_tests.sh