From 9a1fa9acbcca4f45fb69dedc0283e35ef4b2f565 Mon Sep 17 00:00:00 2001
From: Jonas Kruckenberg <iterpre@protonmail.com>
Date: Wed, 14 Dec 2022 20:36:30 +0100
Subject: [PATCH] unify workflows

---
 .github/workflows/format-rust.yml | 41 -------------------------------
 .github/workflows/lint-rust.yml   | 20 ++++++++++++++-
 2 files changed, 19 insertions(+), 42 deletions(-)
 delete mode 100644 .github/workflows/format-rust.yml

diff --git a/.github/workflows/format-rust.yml b/.github/workflows/format-rust.yml
deleted file mode 100644
index 21615ba1..00000000
--- a/.github/workflows/format-rust.yml
+++ /dev/null
@@ -1,41 +0,0 @@
-name: Format Rust
-
-on:
-  push:
-    branches:
-      - dev
-    paths:
-      - '.github/workflows/format-rust.yml'
-      - 'plugins/src/**'
-      - "**/Cargo.toml"
-  pull_request:
-    branches:
-      - dev
-    paths:
-      - '.github/workflows/format-rust.yml'
-      - 'plugins/src/**'
-      - "**/Cargo.toml"
-
-concurrency:
-  group: ${{ github.workflow }}-${{ github.ref }}
-  cancel-in-progress: true
-
-jobs:
-  format:
-    runs-on: ubuntu-latest
-    strategy:
-      fail-fast: false
-
-    steps:
-    - uses: actions/checkout@v3
-    - name: Install rustfmt with nightly toolchain
-      uses: actions-rs/toolchain@v1
-      with:
-          profile: minimal
-          toolchain: nightly
-          override: true
-          components: rustfmt
-    - uses: actions-rs/cargo@v1
-      with:
-        command: fmt
-        args: --all -- --check
\ No newline at end of file
diff --git a/.github/workflows/lint-rust.yml b/.github/workflows/lint-rust.yml
index 446c8209..313dc18d 100644
--- a/.github/workflows/lint-rust.yml
+++ b/.github/workflows/lint-rust.yml
@@ -44,4 +44,22 @@ jobs:
         with:
           token: ${{ secrets.GITHUB_TOKEN }}
           args: --all --all-targets --all-features -- -D warnings
-          name: clippy
\ No newline at end of file
+          name: clippy
+  fmt:
+    runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+
+    steps:
+    - uses: actions/checkout@v3
+    - name: Install rustfmt with nightly toolchain
+      uses: actions-rs/toolchain@v1
+      with:
+          profile: minimal
+          toolchain: nightly
+          override: true
+          components: rustfmt
+    - uses: actions-rs/cargo@v1
+      with:
+        command: fmt
+        args: --all -- --check
\ No newline at end of file