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",
+]