Merge pull request #28 from jwhb/consolidate-actions

Consolidate rust-fmt into rust workflow
namib-project · Mar 17, 2024 · 9c20b72 · 9c20b72
2 parents 487e89a + c0a4fd6
commit 9c20b72
Show file tree

Hide file tree

Showing 2 changed files with 33 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,39 @@ env:
   RUSTFLAGS: "-Dwarnings"
 
 jobs:
+  fmt:
+    name: Rustfmt
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout repo
+        uses: actions/checkout@v4
+      - name: Install Rust nightly toolchain with clippy
+        uses: dtolnay/rust-toolchain@nightly
+        with:
+          components: rustfmt
+      - name: Run Rustfmt
+        run: cargo fmt -- --check
+  clippy:
+    name: Clippy
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout repo
+        uses: actions/checkout@v4
+      - name: Install Rust nightly toolchain with clippy
+        uses: dtolnay/rust-toolchain@nightly
+        with:
+          components: clippy
+      - name: Run Clippy
+        run: cargo clippy --all-targets --all-features
   build:
-
+    name: Rust Build & Test
     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
+      - name: Checkout repo
+        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