From 3ab4f8ff579012608f87c9e8c31ba13d5c2cb068 Mon Sep 17 00:00:00 2001
From: Xithrius <xithrius@gmail.com>
Date: Sun, 19 Sep 2021 17:26:40 -0700
Subject: [PATCH] Moved CI into one file, lint depends on build

---
 .github/workflows/{build-test.yml => ci.yml} | 23 +++++++++++++++++--
 .github/workflows/lint.yml                   | 24 --------------------
 2 files changed, 21 insertions(+), 26 deletions(-)
 rename .github/workflows/{build-test.yml => ci.yml} (62%)
 delete mode 100644 .github/workflows/lint.yml

diff --git a/.github/workflows/build-test.yml b/.github/workflows/ci.yml
similarity index 62%
rename from .github/workflows/build-test.yml
rename to .github/workflows/ci.yml
index 8e4704c..321dd1e 100644
--- a/.github/workflows/build-test.yml
+++ b/.github/workflows/ci.yml
@@ -1,4 +1,4 @@
-name: Building & Testing
+name: CI
 
 on:
   push:
@@ -10,7 +10,7 @@ env:
   CARGO_TERM_COLOR: always
 
 jobs:
-  build:
+  build-test:
     strategy:
       fail-fast: false
 
@@ -34,3 +34,22 @@ jobs:
 
       - name: Run tests
         run: cargo test --verbose
+
+  lint:
+    name: Formatter
+
+    needs: build-test
+
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: actions/checkout@v2
+
+      - name: Install Rust
+        run: |
+          rustup update stable
+          rustup default stable
+          rustup component add rustfmt
+
+      - name: Check Formatting
+        run: cargo fmt --all -- --check
diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
deleted file mode 100644
index b277892..0000000
--- a/.github/workflows/lint.yml
+++ /dev/null
@@ -1,24 +0,0 @@
-name: Linting
-
-on:
-  push:
-    branches:
-      - main
-  pull_request:
-
-jobs:
-  rustfmt:
-    name: Formatter
-    runs-on: ubuntu-latest
-
-    steps:
-      - uses: actions/checkout@v2
-
-      - name: Install Rust
-        run: |
-          rustup update stable
-          rustup default stable
-          rustup component add rustfmt
-
-      - name: Check Formatting
-        run: cargo fmt --all -- --check