From ccece4bf1c669cc5930cd7297e785e05aa157eba Mon Sep 17 00:00:00 2001 From: Christopher Joe Date: Mon, 11 Dec 2017 12:27:53 +1300 Subject: [PATCH 1/2] Feature update composer with --prefer-source flag so that tests are included --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index b93f619..7b57818 100644 --- a/.travis.yml +++ b/.travis.yml @@ -67,7 +67,7 @@ before_script: - composer validate - if [[ $DB == PGSQL ]]; then composer require --no-update silverstripe/postgresql:2.0.x-dev; fi - if [[ $BEHAT_TEST ]]; then composer require --no-update silverstripe/behat-extension:^3 silverstripe/serve:dev-master se/selenium-server-standalone:2.41.0; fi; - - composer install --prefer-dist --no-interaction --no-progress --no-suggest --optimize-autoloader --verbose --profile + - composer install --prefer-source --no-interaction --no-progress --no-suggest --optimize-autoloader --verbose --profile # Start behat services - if [[ $BEHAT_TEST ]]; then echo 'SS_BASE_URL=http://localhost:8080/' >> .env; fi From e06e3c4e835d303d3ab54a5e3513bbd2a9ff48d5 Mon Sep 17 00:00:00 2001 From: Damian Mooyman Date: Tue, 19 Dec 2017 12:07:04 +1300 Subject: [PATCH 2/2] Update travis.yml --- .travis.yml | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index 7b57818..995d460 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,6 +2,8 @@ language: php dist: trusty +group: deprecated-2017Q4 + cache: directories: - $HOME/.composer/cache/files @@ -15,7 +17,7 @@ addons: env: global: - TRAVIS_NODE_VERSION="6" - - COMPOSER_ROOT_VERSION="4.0.x-dev" + - COMPOSER_ROOT_VERSION="4.x-dev" - DISPLAY=":99" - XVFBARGS=":99 -ac -screen 0 1024x768x16" @@ -58,7 +60,6 @@ matrix: before_script: # Init PHP - - printf "\n" | pecl install imagick - phpenv rehash - phpenv config-rm xdebug.ini || true - echo 'memory_limit = 2048M' >> ~/.phpenv/versions/$(phpenv version-name)/etc/conf.d/travis.ini @@ -66,7 +67,7 @@ before_script: # Install composer dependencies - composer validate - if [[ $DB == PGSQL ]]; then composer require --no-update silverstripe/postgresql:2.0.x-dev; fi - - if [[ $BEHAT_TEST ]]; then composer require --no-update silverstripe/behat-extension:^3 silverstripe/serve:dev-master se/selenium-server-standalone:2.41.0; fi; + - if [[ $BEHAT_TEST ]]; then composer require --no-update silverstripe/behat-extension:^3 silverstripe/serve:^2 se/selenium-server-standalone:2.41.0; fi; - composer install --prefer-source --no-interaction --no-progress --no-suggest --optimize-autoloader --verbose --profile # Start behat services