tonyair
/
silverstripe-restfulserver
mirror of https://github.com/silverstripe/silverstripe-restfulserver
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #84 from creative-commoners/master 

Travis config update, remove branch aliases
This commit is contained in:
Garion Herman 2019-11-07 11:47:13 +13:00 committed by GitHub
parent 444d1aa14f 6051c086bf
commit a6f2162564
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
.travis.yml
View File

@ -1,25 +1,30 @@
language: php language: php
dist: trusty dist: xenial
services:
- mysql
- postgresql
addons:
apt:
packages:
- tidy
env: env:
global: global:
- COMPOSER_ROOT_VERSION=2.0.x-dev - COMPOSER_ROOT_VERSION=2.x-dev
matrix: matrix:
include: include:
- php: 5.6
env: DB=MYSQL RECIPE_VERSION=4.3.x-dev PHPUNIT_TEST=1
- php: 7.1 - php: 7.1
env: DB=MYSQL RECIPE_VERSION=4.3.x-dev PHPCS_TEST=1 PHPUNIT_TEST=1 env: DB=MYSQL PHPCS_TEST=1 PHPUNIT_TEST=1
- php: 7.1 - php: 7.1
env: DB=MYSQL RECIPE_VERSION=4.4.x-dev PHPUNIT_TEST=1 env: DB=PGSQL PHPUNIT_COVERAGE_TEST=1
- php: 7.2 - php: 7.2
env: DB=PGSQL RECIPE_VERSION=4.3.x-dev PHPUNIT_COVERAGE_TEST=1 env: DB=MYSQL PHPUNIT_TEST=1
- php: 7.2
env: DB=MYSQL RECIPE_VERSION=4.4.x-dev PHPUNIT_TEST=1
- php: 7.3 - php: 7.3
env: DB=MYSQL RECIPE_VERSION=4.x-dev PHPUNIT_TEST=1 env: DB=MYSQL PHPUNIT_TEST=1
before_script: before_script:
# Init PHP # Init PHP
@ -28,9 +33,9 @@ before_script:
# Install composer dependencies # Install composer dependencies
- composer validate - composer validate
- composer require --no-update silverstripe/recipe-core:"$RECIPE_VERSION" - composer require --no-update silverstripe/recipe-core:^4
- if [[ $DB == PGSQL ]]; then composer require --no-update silverstripe/postgresql 2.1.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

5
composer.json
View File

@ -28,11 +28,6 @@
"SilverStripe\\RestfulServer\\Tests\\": "tests" "SilverStripe\\RestfulServer\\Tests\\": "tests"
} }
}, },
"extra": {
"branch-alias": {
"dev-master": "2.x-dev"
}
},
"prefer-stable": true, "prefer-stable": true,
"minimum-stability": "dev" "minimum-stability": "dev"
} }