diff --git a/.travis.yml b/.travis.yml index 7a70cdc..307e909 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,25 +1,33 @@ language: php +dist: xenial + +services: + - mysql + - postgresql + env: global: - COMPOSER_ROOT_VERSION="2.x-dev" matrix: include: - - php: 5.6 - env: DB=MYSQL PHPCS_TEST=1 PHPUNIT_TEST=1 - - php: 7.0 - env: DB=PGSQL PHPUNIT_TEST=1 - php: 7.1 + env: DB=MYSQL PHPUNIT_TEST=1 + - php: 7.1 + env: DB=PGSQL PHPUNIT_TEST=1 + - php: 7.2 + env: DB=MYSQL PHPUNIT_TEST=1 PHPCS_TEST=1 + - php: 7.3 env: DB=MYSQL PHPUNIT_COVERAGE_TEST=1 before_script: - phpenv rehash - phpenv config-rm xdebug.ini - - composer install --prefer-dist - - composer require --prefer-dist --no-update silverstripe/recipe-cms:1.0.x-dev - - if [[ $DB == PGSQL ]]; then composer require --prefer-dist --no-update silverstripe/postgresql:2.0.x-dev; fi + - composer install --prefer-source + - composer require --prefer-source --no-update silverstripe/recipe-cms:^4 + - if [[ $DB == PGSQL ]]; then composer require --prefer-dist --no-update silverstripe/postgresql:^2; fi - composer update script: diff --git a/composer.json b/composer.json index 52b95a1..6529c3b 100644 --- a/composer.json +++ b/composer.json @@ -20,9 +20,6 @@ "squizlabs/php_codesniffer": "^3.0" }, "extra": { - "branch-alias": { - "dev-master": "2.x-dev" - }, "expose": [ "css", "javascript"