aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexis von Glasow <ashgenesis@gmail.com>2018-03-06 13:33:57 +0100
committerAlexis von Glasow <ashgenesis@gmail.com>2018-03-06 13:33:57 +0100
commit53e4d26e6dd2b25ceb06abc5a5d49e12d484f2d5 (patch)
tree9ba6701feb04b12cdd1b4a8abf104dcbeb170ee6
parent1522f74ad2af75ab99947fe168d9b888cb8c3a5f (diff)
downloadZombie-master.zip
Zombie-master.tar.gz
Zombie-master.tar.bz2
chore(Bors) Configuring Bors-ngHEADmaster
Address hoaproject/Central#81.
-rw-r--r--.travis.yml6
-rw-r--r--bors.toml4
2 files changed, 10 insertions, 0 deletions
diff --git a/.travis.yml b/.travis.yml
index 5c21aa0..a7bbf38 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,5 +1,11 @@
language: php
+branches:
+ only:
+ - staging
+ - trying
+ - master
+
matrix:
include:
- php: 5.5
diff --git a/bors.toml b/bors.toml
new file mode 100644
index 0000000..8f7747d
--- /dev/null
+++ b/bors.toml
@@ -0,0 +1,4 @@
+status = [
+ "continuous-integration/travis-ci/push"
+]
+timeout_sec = 1800