aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Cullum <unknownbliss@phpbbdevelopers.net>2012-03-22 14:44:36 +0000
committerMichael Cullum <unknownbliss@phpbbdevelopers.net>2012-03-22 14:44:36 +0000
commit115ee7f3b815567cf598178225022b2d7d7f5310 (patch)
tree2281bd7545e0842390e90c77c6dcb1217235b7cc
parentc7f65fba627680e7de81ae6c7ea9c1e0fc4359ea (diff)
downloadforums-115ee7f3b815567cf598178225022b2d7d7f5310.tar
forums-115ee7f3b815567cf598178225022b2d7d7f5310.tar.gz
forums-115ee7f3b815567cf598178225022b2d7d7f5310.tar.bz2
forums-115ee7f3b815567cf598178225022b2d7d7f5310.tar.xz
forums-115ee7f3b815567cf598178225022b2d7d7f5310.zip
[task/travis] Some more small travis fixes
PHPBB3-10718
-rw-r--r--.travis.yml6
-rw-r--r--travis/phpunit-mysql-travis.xml2
2 files changed, 1 insertions, 7 deletions
diff --git a/.travis.yml b/.travis.yml
index d638e1cccd..78221d588c 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -26,9 +26,3 @@ notifications:
- dev-team@phpbb.com
on_success: change
on_failure: change
-
-branches:
- only:
- develop
- develop-olympus
- task/travis
diff --git a/travis/phpunit-mysql-travis.xml b/travis/phpunit-mysql-travis.xml
index a849f50136..807dfbcdaa 100644
--- a/travis/phpunit-mysql-travis.xml
+++ b/travis/phpunit-mysql-travis.xml
@@ -8,7 +8,7 @@
processIsolation="false"
stopOnFailure="false"
syntaxCheck="true"
- strict="true"
+ strict="true"
bootstrap="../tests/bootstrap.php">
<testsuites>
<testsuite name="phpBB Test Suite">