diff --git a/.travis.yml b/.travis.yml index bbb5507101..c35782b5e4 100644 --- a/.travis.yml +++ b/.travis.yml @@ -37,7 +37,7 @@ install: script: - if [[ $RELEASE = dev ]]; then composer --verbose remove --no-update drupal/console; fi; - - if [[ $RELEASE = dev ]]; then composer --verbose require --no-update drupal/core:8.6.x-dev webflo/drupal-core-require-dev:8.6.x-dev; fi; + - if [[ $RELEASE = dev ]]; then composer --verbose require --no-update drupal/core:8.7.x-dev webflo/drupal-core-require-dev:8.7.x-dev; fi; - if [[ $RELEASE = dev ]]; then composer --verbose update; fi; - cd $TRAVIS_BUILD_DIR/web - ./../vendor/bin/drush site-install --verbose --yes --db-url=sqlite://tmp/site.sqlite diff --git a/composer.json b/composer.json index 49a9884a0c..3fe34336e9 100644 --- a/composer.json +++ b/composer.json @@ -17,17 +17,17 @@ ], "require": { "composer/installers": "^1.2", - "cweagans/composer-patches": "^1.6", + "cweagans/composer-patches": "^1.6.5", "drupal-composer/drupal-scaffold": "^2.5", "drupal/console": "^1.0.2", - "drupal/core": "~8.5.3", + "drupal/core": "^8.6.0", "drush/drush": "^9.0.0", "vlucas/phpdotenv": "^2.4", "webflo/drupal-finder": "^1.0.0", "webmozart/path-util": "^2.3" }, "require-dev": { - "webflo/drupal-core-require-dev": "~8.5.3" + "webflo/drupal-core-require-dev": "^8.6.0" }, "conflict": { "drupal/drupal": "*" @@ -58,6 +58,9 @@ ] }, "extra": { + "patchLevel": { + "drupal/core": "-p2" + }, "installer-paths": { "web/core": ["type:drupal-core"], "web/libraries/{$name}": ["type:drupal-library"],