From 68c1b6eba88fed7e0d57bde5a734d3d1d5e2a923 Mon Sep 17 00:00:00 2001 From: Daniel Gomez Pan Date: Mon, 7 Dec 2015 07:12:50 +0100 Subject: [PATCH 1/3] Update travis --- .travis.yml | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/.travis.yml b/.travis.yml index a94ff31..a6536e0 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 # faster builds on new travis setup not using sudo sudo: false From 044e9f153ef3a5f87ef1abcb711fb6d7312a68c7 Mon Sep 17 00:00:00 2001 From: Daniel Gomez Pan Date: Mon, 7 Dec 2015 07:59:16 +0100 Subject: [PATCH 2/3] Update composer-asset-plugin --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index a6536e0..b21f51e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -24,7 +24,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 From c7f0b792047fd8270abdd27a6767d3699cf584e1 Mon Sep 17 00:00:00 2001 From: Daniel Gomez Pan Date: Mon, 7 Dec 2015 12:23:28 +0100 Subject: [PATCH 3/3] Remove block comment [skip ci] --- .travis.yml | 7 ------- 1 file changed, 7 deletions(-) diff --git a/.travis.yml b/.travis.yml index b21f51e..f4123cf 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 - # faster builds on new travis setup not using sudo sudo: false