Configure bors (#285)

.github/workflows/check.yml

@@ -1,24 +1,7 @@
-on:
-  workflow_dispatch:
-  pull_request:
-    paths:
-      - "cli/**"
-      - "lib/**"
-      - "/Cargo.*"
-  push:
-    branches:
-      - main
-      - try/**
-    tags-ignore:
-      - "cli-v*.*.*"
-      - "lib-v*.*.*"
-    paths:
-      - "cli/**"
-      - "lib/**"
-      - "/Cargo.*"
-      - ".github/**"
+name: PR checks
 
-name: Checks & Tests
+on:
+  pull_request:
 
 jobs:
   check:
@@ -29,7 +12,7 @@ jobs:
           - windows
           - macos
 
-    name: Check & Test on ${{ matrix.platform }}
+    name: PR check on ${{ matrix.platform }}
     runs-on: "${{ matrix.platform }}-latest"
 
     steps:
@@ -40,28 +23,7 @@ jobs:
           toolchain: stable
           override: true
       - run: rustup component add clippy
-      - uses: actions-rs/cargo@v1
-        with:
-          command: check
-      - uses: actions-rs/cargo@v1
-        with:
-          command: test
       - uses: actions-rs/cargo@v1
         with:
           command: clippy
 
-  msrv:
-    name: Check on MSRV
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v2
-      - uses: actions-rs/toolchain@v1
-        with:
-          profile: minimal
-          toolchain: 1.58.0
-          override: true
-      - uses: actions-rs/cargo@v1
-        with:
-          command: check
-          args: --package watchexec
-

.github/workflows/merge.yml

@@ -0,0 +1,48 @@
+name: Merge (with bors)
+
+on:
+  push:
+    branches:
+      - main
+      - staging
+      - trying
+    tags-ignore:
+      - "cli-v*.*.*"
+      - "lib-v*.*.*"
+
+jobs:
+  test:
+    strategy:
+      matrix:
+        platform:
+          - ubuntu
+          - windows
+          - macos
+
+    name: Merge test 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: test
+
+  msrv:
+    name: Merge test on MSRV
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+      - uses: actions-rs/toolchain@v1
+        with:
+          profile: minimal
+          toolchain: 1.58.0
+          override: true
+      - uses: actions-rs/cargo@v1
+        with:
+          command: test

bors.toml

@@ -0,0 +1,7 @@
+status = ["Merge test on %"]
+use_squash_merge = true
+delete_merged_branches = true
+update_base_for_deletes = true
+
+# Disabled until https://github.com/bors-ng/bors-ng/issues/1434 is fixed
+#pr_status = ["PR check on ubuntu"]