aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexis von Glasow <ashgenesis@gmail.com>2018-03-06 13:32:24 +0100
committerAlexis von Glasow <ashgenesis@gmail.com>2018-03-06 13:32:24 +0100
commitf9cf4ea2333be41b8e13f7f4b6cfe2ff52312848 (patch)
treeca3a6f83754440db16053628b346cf53585050a5
parenta6c81882667a50ddf2e99b42a92e0662d82df1d9 (diff)
downloadRegistry-master.zip
Registry-master.tar.gz
Registry-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 7b6759f..2cd9626 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