diff --git a/.travis.yml b/.travis.yml index 7c1453e..bc41fd2 100644 --- a/.travis.yml +++ b/.travis.yml @@ -8,7 +8,7 @@ before_install: env: global: - - COMPOSER_ROOT_VERSION="2.0.x-dev" + - COMPOSER_ROOT_VERSION="2.3.x-dev" - DISPLAY=":99" - XVFBARGS=":99 -ac -screen 0 1024x768x16" - SS_BASE_URL="http://localhost:8080/" @@ -17,15 +17,17 @@ env: matrix: include: - php: 5.6 - env: DB=MYSQL INSTALLER_VERSION=4.0.x-dev PHPCS_TEST=1 PHPUNIT_TEST=1 + env: DB=MYSQL INSTALLER_VERSION=4.4.x-dev PHPCS_TEST=1 PHPUNIT_TEST=1 - php: 7.0 - env: DB=PGSQL INSTALLER_VERSION=4.1.x-dev PHPUNIT_TEST=1 + env: DB=PGSQL INSTALLER_VERSION=4.4.x-dev PHPUNIT_TEST=1 - php: 7.1 - env: DB=MYSQL INSTALLER_VERSION=4.1.x-dev BEHAT_TEST=1 + env: DB=MYSQL INSTALLER_VERSION=4.4.x-dev BEHAT_TEST=1 - php: 7.2 - env: DB=MYSQL INSTALLER_VERSION=4.2.x-dev PHPUNIT_COVERAGE_TEST=1 + env: DB=MYSQL INSTALLER_VERSION=4.4.x-dev PHPUNIT_COVERAGE_TEST=1 - php: 7.2 env: DB=MYSQL INSTALLER_VERSION=4.x-dev BEHAT_TEST=1 + - php: 7.3 + env: DB=MYSQL INSTALLER_VERSION=4.4.x-dev PHPUNIT_TEST=1 before_script: # Extra $PATH @@ -39,7 +41,7 @@ before_script: # Install composer - composer validate - composer require silverstripe/installer:"$INSTALLER_VERSION" silverstripe/recipe-testing:^1 --no-update - - if [[ $DB == PGSQL ]]; then composer require --no-update silverstripe/postgresql:2.0.x-dev; fi + - if [[ $DB == PGSQL ]]; then composer require --no-update silverstripe/postgresql:2.2.x-dev; fi - composer install --prefer-source --no-interaction --no-progress --no-suggest --optimize-autoloader --verbose --profile # Behat bootstrapping diff --git a/composer.json b/composer.json index f3dff6c..fe3c11f 100644 --- a/composer.json +++ b/composer.json @@ -15,12 +15,12 @@ } ], "require": { - "silverstripe/framework": "^4", - "silverstripe/cms": "^4", - "silverstripe/admin": "^1", - "silverstripe/asset-admin": "^1", - "silverstripe/errorpage": "^1", - "silverstripe/versioned": "^1" + "silverstripe/framework": "^4.4@dev", + "silverstripe/cms": "^4.4@dev", + "silverstripe/admin": "^1.4@dev", + "silverstripe/asset-admin": "^1.4@dev", + "silverstripe/errorpage": "^1.4@dev", + "silverstripe/versioned": "^1.4@dev" }, "require-dev": { "phpunit/phpunit": "^5.7", @@ -33,9 +33,6 @@ } }, "extra": { - "branch-alias": { - "dev-master": "2.x-dev" - }, "expose": [ "javascript", "css"