From a575611e82edf236abba4cb6c6f8eec30caeadbb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20J=C3=B6rdens?= <rj@quartiq.de>
Date: Mon, 3 Jun 2019 17:22:38 +0200
Subject: [PATCH] add bors

---
 .github/bors.toml | 5 +++++
 .travis.yml       | 6 ++++++
 2 files changed, 11 insertions(+)
 create mode 100644 .github/bors.toml

diff --git a/.github/bors.toml b/.github/bors.toml
new file mode 100644
index 0000000..9725473
--- /dev/null
+++ b/.github/bors.toml
@@ -0,0 +1,5 @@
+block_labels = ["S-blocked"]
+delete_merged_branches = true
+status = [
+  "continuous-integration/travis-ci/push",
+]
diff --git a/.travis.yml b/.travis.yml
index ba4f15b..3ea9993 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -9,6 +9,12 @@ matrix:
     - rust: nightly
       env: FEATURES='bkpt'
 
+branches:
+  only:
+    - staging
+    - trying
+    - master
+
 before_script:
   - rustup target add thumbv7em-none-eabihf
     # - rustup component add clippy