aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorzotlabs <mike@macgirvin.com>2016-10-20 00:33:23 -0700
committerzotlabs <mike@macgirvin.com>2016-10-20 00:33:23 -0700
commit0d939b5ab0f205e92adfd3e268207f9058c09fa0 (patch)
tree4e2e6671506ed3fd9af48f39dca1980d1cc02bbf
parent81f3a5cf940d8ac4904a8f1e404259cc45106ffc (diff)
parentb983cf8b5fbeb53b330998e8302bed258f423496 (diff)
downloadvolse-hubzilla-0d939b5ab0f205e92adfd3e268207f9058c09fa0.tar.gz
volse-hubzilla-0d939b5ab0f205e92adfd3e268207f9058c09fa0.tar.bz2
volse-hubzilla-0d939b5ab0f205e92adfd3e268207f9058c09fa0.zip
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge
-rw-r--r--.travis.yml12
1 files changed, 5 insertions, 7 deletions
diff --git a/.travis.yml b/.travis.yml
index 583b2a1a8..2830d1b9f 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -5,10 +5,6 @@ language: php
php:
# using major version aliases
- # aliased to a recent 5.4.x version
- - 5.4
- # aliased to a recent 5.5.x version
- - 5.5
# aliased to a recent 5.6.x version
- 5.6
# aliased to a recent 7.x version
@@ -27,7 +23,6 @@ matrix:
# - php: hhvm
# env: DB=pgsql # PDO driver for pgsql is unsupported by HHVM (3rd party install for support)
allow_failures:
- - php: 7.0
- php: hhvm
# execute any number of scripts before the test run, custom env's are available as variables
@@ -36,11 +31,14 @@ matrix:
# - if [[ "$DB" == "pgsql" ]]; then psql -c "create database hello_world_test;" -U postgres; fi
# - if [[ "$DB" == "mysql" ]]; then mysql -e "create database IF NOT EXISTS hello_world_test;" -uroot; fi
+install:
+ - composer require phpunit/phpunit
+
# omitting "script:" will default to phpunit
# use the $DB env variable to determine the phpunit.xml to use
-script: phpunit tests/*php
+script: vendor/bin/phpunit tests/unit/
# configure notifications (email, IRC, campfire etc)
notifications:
# irc: "irc.freenode.org#yourfavouriteroomfortravis"
-# a plugin/script to post to a hubzilla channel would be neat here \ No newline at end of file
+# a plugin/script to post to a hubzilla channel would be neat here