summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAnthony Ramine <n.oxyde@gmail.com>2017-01-29 10:07:28 +0100
committerAnthony Ramine <n.oxyde@gmail.com>2017-01-29 10:25:43 +0100
commitfba478f827f549a17daa1aa3d8fe7b6d39967d30 (patch)
tree5275e2998e09123ddca1d35a7fb112ea361631bd
parentf5b1ae88282adfc2fe2253e4cd51c6ba5eca0c54 (diff)
Add bors configuration
-rw-r--r--.travis.yml3
-rw-r--r--bors.toml1
2 files changed, 4 insertions, 0 deletions
diff --git a/.travis.yml b/.travis.yml
index 4ecd9b6..088c2e4 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -3,3 +3,6 @@ rust:
- nightly
- beta
- stable
+branches:
+ except:
+ - staging.tmp
diff --git a/bors.toml b/bors.toml
new file mode 100644
index 0000000..359f894
--- /dev/null
+++ b/bors.toml
@@ -0,0 +1 @@
+status = ["continuous-integration/travis-ci/push"]