From d9d59dc71067cb39034f95fa90a0a45c7b07c2ed Mon Sep 17 00:00:00 2001
From: Taiki Endo <te316e89@gmail.com>
Date: Sun, 6 Oct 2019 23:07:16 +0900
Subject: [PATCH 1/3] Add GitHub Actions to the merge requirement of bors

---
 .github/workflows/ci.yml     | 27 ++++++++++++++++++++++++++-
 .github/workflows/clippy.yml | 20 --------------------
 bors.toml                    | 11 ++++++++++-
 3 files changed, 36 insertions(+), 22 deletions(-)
 delete mode 100644 .github/workflows/clippy.yml

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index f8bd9f4..aec355b 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -1,4 +1,11 @@
-on: pull_request
+name: CI
+
+on:
+  pull_request:
+  push:
+    branches:
+      - staging
+      - trying
 
 jobs:
   build_and_test:
@@ -65,3 +72,21 @@ jobs:
 
     - name: Docs
       run: cargo doc --features docs
+
+  clippy_check:
+    name: Clippy check
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v1
+      - id: component
+        uses: actions-rs/components-nightly@v1
+        with:
+          component: clippy
+      - uses: actions-rs/toolchain@v1
+        with:
+            toolchain: ${{ steps.component.outputs.toolchain }}
+            override: true
+      - run: rustup component add clippy
+      - uses: actions-rs/clippy-check@v1
+        with:
+          token: ${{ secrets.GITHUB_TOKEN }}
diff --git a/.github/workflows/clippy.yml b/.github/workflows/clippy.yml
deleted file mode 100644
index c26affb..0000000
--- a/.github/workflows/clippy.yml
+++ /dev/null
@@ -1,20 +0,0 @@
-on: pull_request
-
-name: Clippy check
-jobs:
-  clippy_check:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v1
-      - id: component
-        uses: actions-rs/components-nightly@v1
-        with:
-          component: clippy
-      - uses: actions-rs/toolchain@v1
-        with:
-            toolchain: ${{ steps.component.outputs.toolchain }}
-            override: true
-      - run: rustup component add clippy
-      - uses: actions-rs/clippy-check@v1
-        with:
-          token: ${{ secrets.GITHUB_TOKEN }}
diff --git a/bors.toml b/bors.toml
index 359f894..7489440 100644
--- a/bors.toml
+++ b/bors.toml
@@ -1 +1,10 @@
-status = ["continuous-integration/travis-ci/push"]
+status = [
+    # Travis CI
+    "continuous-integration/travis-ci/push",
+    # GitHub Actions
+    "Build and test on ubuntu-latest",
+    "Build and test on windows-latest",
+    "Build and test on macOS-latest",
+    "Checking fmt and docs",
+    "Clippy check",
+]

From 5b9d34a34c33a52da64b5116efaf59d8208b6e3f Mon Sep 17 00:00:00 2001
From: Taiki Endo <te316e89@gmail.com>
Date: Sun, 6 Oct 2019 23:18:34 +0900
Subject: [PATCH 2/3] Tweak job name

---
 .github/workflows/ci.yml | 7 ++++---
 bors.toml                | 6 +++---
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index aec355b..b92e50b 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -9,19 +9,20 @@ on:
 
 jobs:
   build_and_test:
-    name: Build and test on ${{ matrix.os }}
+    name: Build and test
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
         os: [ubuntu-latest, windows-latest, macOS-latest]
+        rust: [nightly]
 
     steps:
     - uses: actions/checkout@master
 
-    - name: Install nightly
+    - name: Install ${{ matrix.rust }}
       uses: actions-rs/toolchain@v1
       with:
-        toolchain: nightly
+        toolchain: ${{ matrix.rust }}
         override: true
 
     - name: check
diff --git a/bors.toml b/bors.toml
index 7489440..c02883d 100644
--- a/bors.toml
+++ b/bors.toml
@@ -2,9 +2,9 @@ status = [
     # Travis CI
     "continuous-integration/travis-ci/push",
     # GitHub Actions
-    "Build and test on ubuntu-latest",
-    "Build and test on windows-latest",
-    "Build and test on macOS-latest",
+    "Build and test (ubuntu-latest, nightly)",
+    "Build and test (windows-latest, nightly)",
+    "Build and test (macOS-latest, nightly)",
     "Checking fmt and docs",
     "Clippy check",
 ]

From f8af22ff98696059f1fc1984a89637479b63ae7b Mon Sep 17 00:00:00 2001
From: Taiki Endo <te316e89@gmail.com>
Date: Mon, 7 Oct 2019 07:02:48 +0900
Subject: [PATCH 3/3] Remove travis from requirements

---
 bors.toml | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/bors.toml b/bors.toml
index c02883d..732f8fc 100644
--- a/bors.toml
+++ b/bors.toml
@@ -1,7 +1,4 @@
 status = [
-    # Travis CI
-    "continuous-integration/travis-ci/push",
-    # GitHub Actions
     "Build and test (ubuntu-latest, nightly)",
     "Build and test (windows-latest, nightly)",
     "Build and test (macOS-latest, nightly)",