From b2b3bb8fde920342428be3932f79ca5e4c7c67ca Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fe=CC=81lix=20Saparelli?= <felix@passcod.name>
Date: Wed, 7 Sep 2022 12:36:55 +1200
Subject: [PATCH] Merge check, bors, and main tests

---
 .github/workflows/{check.yml => clippy.yml} | 10 ++++-
 .github/workflows/main.yml                  | 32 -------------
 .github/workflows/merge.yml                 | 50 ---------------------
 .github/workflows/tests.yml                 | 39 ++++++++++++++++
 4 files changed, 47 insertions(+), 84 deletions(-)
 rename .github/workflows/{check.yml => clippy.yml} (77%)
 delete mode 100644 .github/workflows/main.yml
 delete mode 100644 .github/workflows/merge.yml
 create mode 100644 .github/workflows/tests.yml

diff --git a/.github/workflows/check.yml b/.github/workflows/clippy.yml
similarity index 77%
rename from .github/workflows/check.yml
rename to .github/workflows/clippy.yml
index 27207a8..8261eea 100644
--- a/.github/workflows/check.yml
+++ b/.github/workflows/clippy.yml
@@ -1,7 +1,13 @@
-name: PR checks
+name: Clippy
 
 on:
+  workflow_dispatch:
   pull_request:
+  push:
+    branches:
+      - main
+    tags-ignore:
+      - "*"
 
 jobs:
   check:
@@ -12,7 +18,7 @@ jobs:
           - windows
           - macos
 
-    name: PR check on ${{ matrix.platform }}
+    name: Clippy on ${{ matrix.platform }}
     runs-on: "${{ matrix.platform }}-latest"
 
     steps:
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
deleted file mode 100644
index 12e35af..0000000
--- a/.github/workflows/main.yml
+++ /dev/null
@@ -1,32 +0,0 @@
-name: Main branch
-
-on:
-  push:
-    branches:
-      - main
-    tags-ignore:
-      - "*"
-
-jobs:
-  check:
-    strategy:
-      matrix:
-        platform:
-          - ubuntu
-          - windows
-          - macos
-
-    name: Check on ${{ matrix.platform }}
-    runs-on: "${{ matrix.platform }}-latest"
-
-    steps:
-      - uses: actions/checkout@v2
-      - uses: actions-rs/toolchain@v1
-        with:
-          profile: minimal
-          toolchain: stable
-          override: true
-      - uses: actions-rs/cargo@v1
-        with:
-          command: check
-
diff --git a/.github/workflows/merge.yml b/.github/workflows/merge.yml
deleted file mode 100644
index e7e1c6b..0000000
--- a/.github/workflows/merge.yml
+++ /dev/null
@@ -1,50 +0,0 @@
-name: Merge (with bors)
-
-on:
-  push:
-    branches:
-      - staging
-      - trying
-    tags-ignore:
-      - "*"
-
-jobs:
-  test:
-    strategy:
-      matrix:
-        include:
-          - name: stable-ubuntu
-            platform: ubuntu
-            toolchain: stable
-          - name: stable-windows
-            platform: windows
-            toolchain: stable
-          - name: stable-macos
-            platform: macos
-            toolchain: stable
-          - name: msrv-ubuntu
-            platform: ubuntu
-            toolchain: 1.60.0
-          - name: msrv-windows
-            platform: windows
-            toolchain: 1.60.0
-          - name: msrv-macos
-            platform: macos
-            toolchain: 1.60.0
-
-    name: Test on ${{ matrix.platform }} with Rust ${{ matrix.toolchain }}
-    runs-on: "${{ matrix.platform }}-latest"
-
-    steps:
-      - uses: actions/checkout@v2
-      - uses: actions-rs/toolchain@v1
-        with:
-          profile: minimal
-          toolchain: "${{ matrix.toolchain }}"
-          override: true
-      - name: Run test suite
-        uses: actions-rs/cargo@v1
-        with:
-          command: test
-      - name: Check that CLI runs
-        run: cargo run -p watchexec-cli -- -1 echo
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
new file mode 100644
index 0000000..ee8aa8c
--- /dev/null
+++ b/.github/workflows/tests.yml
@@ -0,0 +1,39 @@
+name: Test suite
+
+on:
+  workflow_dispatch:
+  pull_request:
+  push:
+    branches:
+      - main
+    tags-ignore:
+      - "*"
+
+jobs:
+  test:
+    strategy:
+      matrix:
+        platform:
+          - macos
+          - ubuntu
+          - windows
+        toolchain:
+          - stable
+          - 1.60.0
+
+    name: Test ${{ matrix.platform }} with Rust ${{ matrix.toolchain }}
+    runs-on: "${{ matrix.platform }}-latest"
+
+    steps:
+      - uses: actions/checkout@v2
+      - uses: actions-rs/toolchain@v1
+        with:
+          profile: minimal
+          toolchain: "${{ matrix.toolchain }}"
+          override: true
+      - name: Run test suite
+        uses: actions-rs/cargo@v1
+        with:
+          command: test
+      - name: Check that CLI runs
+        run: cargo run -p watchexec-cli -- -1 echo