From e6c2bd76a110cd52bc340a686a104437ba9599a0 Mon Sep 17 00:00:00 2001
From: Sean OMeara <sean@sean.io>
Date: Thu, 12 Jan 2023 16:38:55 +0100
Subject: [PATCH] tweaking github build

---
 .github/workflows/build.yml | 60 +++++++++----------------------------
 1 file changed, 14 insertions(+), 46 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index f3c63087c..c119698c2 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -20,8 +20,14 @@ jobs:
         key: ${{ runner.os }}-cargo-${{ hashFiles('**/Cargo.lock') }}
         restore-keys: ${{ runner.os }}-cargo-
 
-    - name: make
-      run: make
+    - name: cargo fmt
+      run: cargo fmt --all -- --check
+        
+    - name: cargo build
+      run: cargo build
+
+    - name: cargo test
+      run: cargo test
 
   build_macos:
     runs-on: macos-latest
@@ -42,52 +48,14 @@ jobs:
         key: ${{ runner.os }}-cargo-${{ hashFiles('**/Cargo.lock') }}
         restore-keys: ${{ runner.os }}-cargo-
 
-    - name: make
-      run: make
-
-  test_ubuntu:
-    runs-on: ubuntu-latest
-    steps:
-    - name: checkout
-      uses: actions/checkout@v3
-
-    - name: Set up cargo cache
-      uses: actions/cache@v3
-      continue-on-error: false
-      with:
-        path: |
-          ~/.cargo/bin/
-          ~/.cargo/registry/index/
-          ~/.cargo/registry/cache/
-          ~/.cargo/git/db/
-          target/
-        key: ${{ runner.os }}-cargo-${{ hashFiles('**/Cargo.lock') }}
-        restore-keys: ${{ runner.os }}-cargo-
+    - name: cargo fmt
+      run: cargo fmt --all -- --check
+        
+    - name: cargo build
+      run: cargo build
 
     - name: cargo test
-      run: cargo test -v
-
-  test_macos:
-    runs-on: macos-latest
-    steps:
-    - name: checkout
-      uses: actions/checkout@v3
-
-    - name: Set up cargo cache
-      uses: actions/cache@v3
-      continue-on-error: false
-      with:
-        path: |
-          ~/.cargo/bin/
-          ~/.cargo/registry/index/
-          ~/.cargo/registry/cache/
-          ~/.cargo/git/db/
-          target/
-        key: ${{ runner.os }}-cargo-${{ hashFiles('**/Cargo.lock') }}
-        restore-keys: ${{ runner.os }}-cargo-
-
-    - name: cargo test
-      run: cargo test -v
+      run: cargo test
 
   # build_windows:
   #   runs-on: windows-latest