Travis config update, remove branch aliases

This commit is contained in:
Serge Latyntcev 2019-11-05 14:17:50 +13:00
parent f3fa9fe9fc
commit d09df080ae
2 changed files with 17 additions and 12 deletions

View File

@ -1,16 +1,24 @@
language: php language: php
dist: xenial
services:
- mysql
- postgresql
env: env:
global: global:
- COMPOSER_ROOT_VERSION="4.0.x-dev" - COMPOSER_ROOT_VERSION="4.x-dev"
matrix: matrix:
include: 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 - 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 env: DB=MYSQL PHPUNIT_COVERAGE_TEST=1
before_script: before_script:
@ -18,9 +26,9 @@ before_script:
- phpenv config-rm xdebug.ini - phpenv config-rm xdebug.ini
- composer validate - composer validate
- composer require --no-update silverstripe/recipe-cms:1.0.x-dev silverstripe/userforms:5.0.x-dev - composer require --no-update silverstripe/recipe-cms:^4 silverstripe/userforms:^5
- 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; 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
script: script:
- if [[ $PHPUNIT_TEST ]]; then vendor/bin/phpunit; fi - if [[ $PHPUNIT_TEST ]]; then vendor/bin/phpunit; fi

View File

@ -21,10 +21,7 @@
"extra": { "extra": {
"expose": [ "expose": [
"images" "images"
], ]
"branch-alias": {
"dev-master": "3.x-dev"
}
}, },
"autoload": { "autoload": {
"psr-4": { "psr-4": {