From 03fb6fde5f02c4fce49fbe20ed384e693b805a0a Mon Sep 17 00:00:00 2001 From: Jeremy Benoist Date: Sat, 26 Sep 2015 11:56:15 +0200 Subject: Add multiple database tests on Travis --- .travis.yml | 23 +++++++++++++++++------ 1 file changed, 17 insertions(+), 6 deletions(-) (limited to '.travis.yml') diff --git a/.travis.yml b/.travis.yml index 8d0cf817..f78c2b15 100644 --- a/.travis.yml +++ b/.travis.yml @@ -13,14 +13,22 @@ php: - 5.4 - 5.5 - 5.6 + - 7.0 - hhvm - - nightly + +env: + - DB=mysql + - DB=pgsql + - DB=sqlite matrix: fast_finish: true + exclude: + - php: hhvm + env: DB=pgsql # driver for PostgreSQL currently unsupported by HHVM, requires 3rd party dependency allow_failures: + - php: 7.0 - php: hhvm - - php: nightly branches: only: @@ -29,13 +37,16 @@ branches: install: - composer self-update -# build coverage only on one build, to speed up results feedbacks -# before_script: +before_script: + # disable xdebug since we don't use code-coverage for now + - phpenv config-rm xdebug.ini + # build coverage only on one build, to speed up results feedbacks # - if [[ "$TRAVIS_PHP_VERSION" = "5.6" ]]; then PHPUNIT_FLAGS="--coverage-clover=coverage.clover"; else PHPUNIT_FLAGS=""; fi; + - if [[ "$DB" = "pgsql" ]]; then psql -c 'create database wallabag;' -U postgres; fi; script: - - ant prepare - - bin/phpunit --exclude-group command-doctrine --debug $PHPUNIT_FLAGS + - ant prepare-$DB + - bin/phpunit --exclude-group command-doctrine -v # after_script: # - | -- cgit v1.2.3 From dc22b46bf3428f0000e21ad831357dee4c91246a Mon Sep 17 00:00:00 2001 From: Jeremy Benoist Date: Sat, 26 Sep 2015 19:06:32 +0200 Subject: Fix HHVM & PHP 7.0 --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to '.travis.yml') diff --git a/.travis.yml b/.travis.yml index f78c2b15..b2747e7d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -39,7 +39,7 @@ install: before_script: # disable xdebug since we don't use code-coverage for now - - phpenv config-rm xdebug.ini + - if [[ $TRAVIS_PHP_VERSION != '5.6' && $TRAVIS_PHP_VERSION != 'hhvm' && $TRAVIS_PHP_VERSION != '7.0' ]]; then phpenv config-rm xdebug.ini; fi # build coverage only on one build, to speed up results feedbacks # - if [[ "$TRAVIS_PHP_VERSION" = "5.6" ]]; then PHPUNIT_FLAGS="--coverage-clover=coverage.clover"; else PHPUNIT_FLAGS=""; fi; - if [[ "$DB" = "pgsql" ]]; then psql -c 'create database wallabag;' -U postgres; fi; -- cgit v1.2.3 From 609594fa5e5b9938dd4263bb7fcd659139374f37 Mon Sep 17 00:00:00 2001 From: Jeremy Benoist Date: Sat, 26 Sep 2015 19:23:20 +0200 Subject: Fix authentication error from Github From: http://blog.wyrihaximus.net/2015/09/github-auth-token-on-travis/ --- .travis.yml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to '.travis.yml') diff --git a/.travis.yml b/.travis.yml index b2747e7d..8c9047df 100644 --- a/.travis.yml +++ b/.travis.yml @@ -34,10 +34,9 @@ branches: only: - v2 -install: - - composer self-update - before_script: + - composer self-update + - if [ -n "$GH_TOKEN" ]; then composer config github-oauth.github.com ${GH_TOKEN}; fi; # disable xdebug since we don't use code-coverage for now - if [[ $TRAVIS_PHP_VERSION != '5.6' && $TRAVIS_PHP_VERSION != 'hhvm' && $TRAVIS_PHP_VERSION != '7.0' ]]; then phpenv config-rm xdebug.ini; fi # build coverage only on one build, to speed up results feedbacks -- cgit v1.2.3 From fef4124130484ebdb8194b83a3278e6f970a46fb Mon Sep 17 00:00:00 2001 From: Jeremy Benoist Date: Mon, 28 Sep 2015 20:35:56 +0200 Subject: Enabled Tidy on travis for HHVM --- .travis.yml | 6 ++++++ 1 file changed, 6 insertions(+) (limited to '.travis.yml') diff --git a/.travis.yml b/.travis.yml index 8c9047df..d5355820 100644 --- a/.travis.yml +++ b/.travis.yml @@ -3,6 +3,12 @@ language: php # faster builds on docker-container setup sudo: false +# used for HHVM +addons: + apt: + packages: + - tidy + # cache vendor dirs cache: directories: -- cgit v1.2.3