From adcfa41d708296d227b9668d4f558da48afc9953 Mon Sep 17 00:00:00 2001
From: Yoshua Wuyts <yoshuawuyts@gmail.com>
Date: Sun, 6 Oct 2019 15:20:18 +0200
Subject: [PATCH 1/2] attempt bors integration

Signed-off-by: Yoshua Wuyts <yoshuawuyts@gmail.com>
---
 .github/workflows/ci.yml                    | 11 ++++------
 .github/workflows/{clippy.yml => style.yml} | 23 +++++++++++++++++++--
 bors.toml                                   | 11 +++++++++-
 3 files changed, 35 insertions(+), 10 deletions(-)
 rename .github/workflows/{clippy.yml => style.yml} (50%)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 55c32e744..875d1cd9e 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -1,8 +1,8 @@
 on: pull_request
 
 jobs:
-  build_and_test:
-    name: Build and test on ${{ matrix.os }}
+  check_src:
+    name: Nightly on ${{ matrix.os }}
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
@@ -35,8 +35,8 @@ jobs:
         command: test
         args: --all --doc --features unstable
 
-  check_fmt_and_docs:
-    name: Checking fmt and docs
+  check_docs:
+    name: Docs
     runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@master
@@ -53,15 +53,12 @@ jobs:
 
     - name: setup
       run: |
-        rustup component add rustfmt
         test -x $HOME/.cargo/bin/mdbook || ./ci/install-mdbook.sh
         rustc --version
 
     - name: mdbook
       run: |
         mdbook build docs
-    - name: fmt
-      run: cargo fmt --all -- --check
 
     - name: Docs
       run: cargo doc --features docs,unstable
diff --git a/.github/workflows/clippy.yml b/.github/workflows/style.yml
similarity index 50%
rename from .github/workflows/clippy.yml
rename to .github/workflows/style.yml
index c26affbf4..f71576daf 100644
--- a/.github/workflows/clippy.yml
+++ b/.github/workflows/style.yml
@@ -1,8 +1,9 @@
 on: pull_request
 
-name: Clippy check
+name: Style
 jobs:
-  clippy_check:
+  clippy:
+    name: Clippy
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v1
@@ -18,3 +19,21 @@ jobs:
       - uses: actions-rs/clippy-check@v1
         with:
           token: ${{ secrets.GITHUB_TOKEN }}
+
+  fmt:
+    name: Rustfmt
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@master
+    - id: component
+      uses: actions-rs/components-nightly@v1
+      with:
+        component: rustfmt
+    - uses: actions-rs/toolchain@v1
+      with:
+          toolchain: ${{ steps.component.outputs.toolchain }}
+          override: true
+    - name: setup
+      run: rustup component add rustfmt
+    - name: fmt
+      run: cargo fmt --all -- --check
diff --git a/bors.toml b/bors.toml
index 359f8947b..8dc856aa7 100644
--- a/bors.toml
+++ b/bors.toml
@@ -1 +1,10 @@
-status = ["continuous-integration/travis-ci/push"]
+status = [
+    "test (stable)",
+    "test (beta)",
+    "test (nightly)",
+    "test (macos)",
+    "style (clippy)",
+    "style (rustfmt)",
+    "style (rustdoc)",
+]
+delete_merged_branches = true

From d7d63b7170241cd15bf4ba8dc4c2b6bcd72bea56 Mon Sep 17 00:00:00 2001
From: Yoshua Wuyts <yoshuawuyts@gmail.com>
Date: Sun, 6 Oct 2019 15:25:17 +0200
Subject: [PATCH 2/2] lowercase names

Signed-off-by: Yoshua Wuyts <yoshuawuyts@gmail.com>
---
 .github/workflows/ci.yml    | 5 +++--
 .github/workflows/style.yml | 6 +++---
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 875d1cd9e..c6deeb3a4 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -1,8 +1,9 @@
 on: pull_request
 
+name: test
 jobs:
   check_src:
-    name: Nightly on ${{ matrix.os }}
+    name: nightly on ${{ matrix.os }}
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
@@ -36,7 +37,7 @@ jobs:
         args: --all --doc --features unstable
 
   check_docs:
-    name: Docs
+    name: rustdoc
     runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@master
diff --git a/.github/workflows/style.yml b/.github/workflows/style.yml
index f71576daf..75059d051 100644
--- a/.github/workflows/style.yml
+++ b/.github/workflows/style.yml
@@ -1,9 +1,9 @@
 on: pull_request
 
-name: Style
+name: style
 jobs:
   clippy:
-    name: Clippy
+    name: clippy
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v1
@@ -21,7 +21,7 @@ jobs:
           token: ${{ secrets.GITHUB_TOKEN }}
 
   fmt:
-    name: Rustfmt
+    name: rustfmt
     runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@master