summaryrefslogtreecommitdiffstats
path: root/.travis.yml
diff options
context:
space:
mode:
authorPhil Sturgeon <email@philsturgeon.co.uk>2012-03-14 11:51:36 +0100
committerPhil Sturgeon <email@philsturgeon.co.uk>2012-03-14 11:51:36 +0100
commit15a29e11a1003ff253b4df7c8a4c6e97b052a06d (patch)
tree8297ecf0727c574bd90cb12413f687f8413dce2e /.travis.yml
parent0fe8c8e21315e00dbc06a87290fb268a2dc999a9 (diff)
parentce707b4cafd64b95031690cf927584b1d60c7ad7 (diff)
Merged unit test progress.
Diffstat (limited to '.travis.yml')
-rw-r--r--.travis.yml7
1 files changed, 6 insertions, 1 deletions
diff --git a/.travis.yml b/.travis.yml
index 4e13a83d7..032bf9df5 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -10,4 +10,9 @@ before_script:
- pyrus install http://pear.php-tools.net/get/vfsStream-0.11.2.tgz
- phpenv rehash
-script: phpunit --configuration tests/phpunit.xml \ No newline at end of file
+script: phpunit --configuration tests/phpunit.xml
+
+branches:
+ only:
+ - develop
+ - master \ No newline at end of file