From fa6c76ea2db60d0941ab2d8e00f881a4b23688c1 Mon Sep 17 00:00:00 2001
From: Brooks J Rady <b.j.rady@gmail.com>
Date: Tue, 13 Apr 2021 16:32:59 +0100
Subject: fix(ci): update to use the new build system

---
 .github/workflows/rust.yml | 56 ++++++++++++++++++++--------------------------
 1 file changed, 24 insertions(+), 32 deletions(-)

(limited to '.github')

diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml
index 29aa721ab..29bda75ea 100644
--- a/.github/workflows/rust.yml
+++ b/.github/workflows/rust.yml
@@ -11,48 +11,40 @@ env:
 
 jobs:
   build:
-    name: Build & test
+    name: Build & Test
     runs-on: ubuntu-latest
 
     steps:
     - uses: actions/checkout@v2
     - name: Add WASM target
       run: rustup target add wasm32-wasi
-    - name: Build
-      run: ./build-all.sh --verbose
-    - name: Run tests
-      run: cargo test -j 1 --verbose
-  fmt:
-    name: Rustfmt
+    - name: Install cargo-make
+      run: cargo install --force cargo-make
+    - name: Build & Test
+      run: cargo make
+
+  format:
+    name: Check Formatting
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@v2
-      - uses: actions-rs/toolchain@v1
-        with:
-          profile: minimal
-          toolchain: stable
-          override: true
-      - run: rustup component add rustfmt
-      - uses: actions-rs/cargo@v1
-        with:
-          command: fmt
-          args: --all -- --check
+    - uses: actions/checkout@v2
+    - name: Add WASM target
+      run: rustup target add wasm32-wasi
+    - name: Install cargo-make
+      run: cargo install --force cargo-make
+    - name: Check Format
+      run: cargo make check-format
+
   clippy:
-    name: Clippy
+    name: Check For Clippy Lints
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@v1
-      - uses: actions-rs/toolchain@v1
-        with:
-          toolchain: stable
-          components: clippy
-      - name: Add WASM target
-        run: rustup target add wasm32-wasi
-      - name: Build
-        run: ./build-all.sh --verbose
-      - uses: actions-rs/cargo@v1
-        with:
-          command: clippy
-          args: --all-features --all-targets
+    - uses: actions/checkout@v2
+    - name: Add WASM target
+      run: rustup target add wasm32-wasi
+    - name: Install cargo-make
+      run: cargo install --force cargo-make
+    - name: Check Format
+      run: cargo make clippy -D clippy::all
-- 
cgit v1.2.3