SonataCI 7 лет назад
Родитель
Сommit
b6ba14329d
2 измененных файлов с 9 добавлено и 10 удалено
  1. 3 5
      .travis/before_install_test.sh
  2. 6 5
      .travis/install_test.sh

+ 3 - 5
.travis/before_install_test.sh

@@ -2,13 +2,11 @@
 set -ev
 set -ev
 
 
 if [ "${TRAVIS_PHP_VERSION}" != "hhvm" ]; then
 if [ "${TRAVIS_PHP_VERSION}" != "hhvm" ]; then
-    mv "$HOME/.phpenv/versions/$(phpenv version-name)/etc/conf.d/xdebug.ini" /tmp
-    echo "memory_limit=3072M" >> ~/.phpenv/versions/$(phpenv version-name)/etc/conf.d/travis.ini
+    PHP_INI_DIR="$HOME/.phpenv/versions/$(phpenv version-name)/etc/conf.d/"
+    TRAVIS_INI_FILE="$PHP_INI_DIR/travis.ini"
+    echo "memory_limit=3072M" >> "$TRAVIS_INI_FILE"
 
 
-    if [ ${TRAVIS_PHP_VERSION} '<' '7.0' ]; then
-        echo "extension=mongo.so" >> ~/.phpenv/versions/$(phpenv version-name)/etc/conf.d/travis.ini
     fi
     fi
-fi
 
 
 # To be removed when following PR will be merged: https://github.com/travis-ci/travis-build/pull/718
 # To be removed when following PR will be merged: https://github.com/travis-ci/travis-build/pull/718
 composer self-update --stable
 composer self-update --stable

+ 6 - 5
.travis/install_test.sh

@@ -16,8 +16,9 @@ chmod u+x "${HOME}/bin/phpunit"
 wget https://github.com/satooshi/php-coveralls/releases/download/v1.0.1/coveralls.phar --output-document="${HOME}/bin/coveralls"
 wget https://github.com/satooshi/php-coveralls/releases/download/v1.0.1/coveralls.phar --output-document="${HOME}/bin/coveralls"
 chmod u+x "${HOME}/bin/coveralls"
 chmod u+x "${HOME}/bin/coveralls"
 
 
-# To be removed when this issue will be resolved: https://github.com/composer/composer/issues/5355
-if [ "${COMPOSER_FLAGS}" = '--prefer-lowest' ]; then
-    composer update --prefer-dist --no-interaction --prefer-stable --quiet
-fi
-composer update --prefer-dist --no-interaction --prefer-stable ${COMPOSER_FLAGS}
+# To be removed when these issues are resolved:
+# https://github.com/composer/composer/issues/5355
+# https://github.com/composer/composer/issues/5030
+composer update --prefer-dist --no-interaction --prefer-stable --quiet --ignore-platform-reqs
+
+travis_wait composer update --prefer-dist --no-interaction --prefer-stable ${COMPOSER_FLAGS}