From d49f1019474257151e971ad9438e055730ea3bb6 Mon Sep 17 00:00:00 2001 From: Rob Frawley 2nd Date: Mon, 19 Sep 2016 06:56:01 -0400 Subject: [PATCH] fix travis to not include mongo for 7.1, fix build matrex ordering so symfony 3.2.x isnt overridden by later COMPOSER_FLAGS usage --- .travis.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index b8531804c..e3b56a12d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -30,10 +30,10 @@ matrix: env: SYMFONY_VERSION=3.0.*@dev - php: 5.6 env: SYMFONY_VERSION=3.1.*@dev - - php: 5.3 - env: COMPOSER_FLAGS="--prefer-lowest" - php: 7.0 env: SYMFONY_VERSION=3.2.x-dev + - php: 5.3 + env: COMPOSER_FLAGS="--prefer-lowest" allow_failures: - php: 7.0 env: SYMFONY_VERSION=3.2.x-dev @@ -43,7 +43,7 @@ before_install: - if [ "${TRAVIS_PHP_VERSION}" != "hhvm" ]; then echo "memory_limit = -1" >> ~/.phpenv/versions/$(phpenv version-name)/etc/conf.d/travis.ini; fi; - if [ "${SYMFONY_VERSION:0:3}" == "2.3" ]; then composer remove --dev friendsofphp/php-cs-fixer --no-update; fi; - if [ "${TRAVIS_PHP_VERSION}" != "hhvm" ] && [ "${TRAVIS_PHP_VERSION}" != "5.3" ]; then composer require --dev league/flysystem:~1.0 --no-update; fi; - - if [ "${TRAVIS_PHP_VERSION}" != "hhvm" ] && [ "${TRAVIS_PHP_VERSION}" != "7.0" ]; then composer require --dev doctrine/mongodb-odm:~1.0 --no-update; yes "" | pecl -q install -f mongo; fi; + - if [ "${TRAVIS_PHP_VERSION}" != "hhvm" ] && [ "${TRAVIS_PHP_VERSION:0:1}" != "7" ]; then composer require --dev doctrine/mongodb-odm:~1.0 --no-update; yes "" | pecl -q install -f mongo; fi; - if [ "${SYMFONY_VERSION:-x}" != "x" ]; then composer require "symfony/symfony:${SYMFONY_VERSION}" --no-update; fi; install: composer update --prefer-source $COMPOSER_FLAGS