From 6483c06a10db371e7d96043a9fef72d7955e1067 Mon Sep 17 00:00:00 2001 From: Daniel Gomez Pan Date: Mon, 7 Dec 2015 07:54:10 +0100 Subject: [PATCH 1/2] Update travis --- .travis.yml | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/.travis.yml b/.travis.yml index b3e7fd1..d5d0b36 100644 --- a/.travis.yml +++ b/.travis.yml @@ -6,15 +6,13 @@ php: - 5.6 - 7.0 - hhvm - - hhvm-nightly # run build against hhvm but allow them to fail # http://docs.travis-ci.com/user/build-configuration/#Rows-That-are-Allowed-To-Fail -matrix: - fast_finish: true - allow_failures: - - php: hhvm-nightly - - php: 7.0 +#matrix: +# fast_finish: true +# allow_failures: +# - php: 7.0 services: - mongodb @@ -29,7 +27,7 @@ cache: install: - travis_retry composer self-update && composer --version - - travis_retry composer global require "fxp/composer-asset-plugin:~1.0.0" + - travis_retry composer global require "fxp/composer-asset-plugin:~1.1.1" - export PATH="$HOME/.composer/vendor/bin:$PATH" - travis_retry composer install --prefer-dist --no-interaction @@ -46,7 +44,7 @@ script: after_script: - | if [ $TRAVIS_PHP_VERSION = '5.6' ]; then - cd ../../.. + cd ../../.. travis_retry wget https://scrutinizer-ci.com/ocular.phar php ocular.phar code-coverage:upload --format=php-clover coverage.clover fi From 2924a2bc4e9e9213e14d7965a3e41932d041552a Mon Sep 17 00:00:00 2001 From: Daniel Gomez Pan Date: Mon, 7 Dec 2015 12:37:58 +0100 Subject: [PATCH 2/2] Remove block comment [skip ci] --- .travis.yml | 7 ------- 1 file changed, 7 deletions(-) diff --git a/.travis.yml b/.travis.yml index d5d0b36..54ddc18 100644 --- a/.travis.yml +++ b/.travis.yml @@ -7,13 +7,6 @@ php: - 7.0 - hhvm -# run build against hhvm but allow them to fail -# http://docs.travis-ci.com/user/build-configuration/#Rows-That-are-Allowed-To-Fail -#matrix: -# fast_finish: true -# allow_failures: -# - php: 7.0 - services: - mongodb