From 11b8926c1a5956959e8d44be9d1293429fb63858 Mon Sep 17 00:00:00 2001 From: Sam Minnee Date: Fri, 5 May 2017 16:16:55 +1200 Subject: [PATCH] fixup - prefer-stable necessary to avoid armageddon --- .travis.yml | 2 +- composer.json | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 589ed74c..321e8624 100644 --- a/.travis.yml +++ b/.travis.yml @@ -35,7 +35,7 @@ before_script: - phpenv config-rm xdebug.ini - echo 'memory_limit = 2G' >> ~/.phpenv/versions/$(phpenv version-name)/etc/conf.d/travis.ini - composer install --prefer-dist - - composer require silverstripe/framework:4.0.x-dev silverstripe/config:1.0.x-dev silverstripe/admin:1.0.x-dev silverstripe/assets:1.0.x-dev silverstripe/versioned:1.0.x-dev --prefer-dist + - composer require --update-with-dependencies silverstripe/framework:4.0.x-dev silverstripe/config:1.0.x-dev silverstripe/admin:1.0.x-dev silverstripe/assets:1.0.x-dev silverstripe/versioned:1.0.x-dev --prefer-dist - "if [ \"$DB\" = \"PGSQL\" ]; then composer require silverstripe/postgresql:2.0.x-dev --prefer-dist; fi" - "if [ \"$DB\" = \"SQLITE\" ]; then composer require silverstripe/sqlite3:2.0.x-dev --prefer-dist; fi" - "php ./tests/bootstrap/mysite.php" diff --git a/composer.json b/composer.json index be72562c..abc79a95 100644 --- a/composer.json +++ b/composer.json @@ -44,5 +44,6 @@ "SilverStripe\\CMS\\Tests\\Behaviour\\": "tests/behat/src/" } }, + "prefer-stable": true, "minimum-stability": "dev" }