tonyair/silverstripe-framework
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-framework synced 2024-10-22 14:05:37 +02:00
Code Issues Projects Releases Wiki Activity

Update branch alias and travis

Browse Source
This commit is contained in:
Serge Latyntcev 2019-11-21 14:08:29 +13:00
parent 5232b87819
commit 0b74576c00
2 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
.travis.yml
View File

@ -13,7 +13,7 @@ addons:
env: env:
global: global:
- COMPOSER_ROOT_VERSION=4.5.x-dev - COMPOSER_ROOT_VERSION=4.6.x-dev
matrix: matrix:
fast_finish: true fast_finish: true
@ -69,10 +69,10 @@ before_script:
# Install composer dependencies # Install composer dependencies
- composer validate - composer validate
- mkdir ./public - mkdir ./public
- if [[ $DB == PGSQL ]]; then composer require silverstripe/postgresql:2.2.x-dev --no-update; fi - if [[ $DB == PGSQL ]]; then composer require silverstripe/postgresql:2.4.x-dev --no-update; fi
- if [[ $DB == SQLITE ]]; then composer require silverstripe/sqlite3:2.2.x-dev --no-update; fi - if [[ $DB == SQLITE ]]; then composer require silverstripe/sqlite3:2.2.x-dev --no-update; fi
- composer require silverstripe/recipe-testing:^1 silverstripe/recipe-core:4.5.x-dev silverstripe/admin:1.5.x-dev silverstripe/versioned:1.5.x-dev --no-update - composer require silverstripe/recipe-testing:^1 silverstripe/recipe-core:4.6.x-dev silverstripe/admin:1.6.x-dev silverstripe/versioned:1.6.x-dev --no-update
- if [[ $PHPUNIT_TEST == cms ]]; then composer require silverstripe/recipe-cms:4.5.x-dev --no-update; fi - if [[ $PHPUNIT_TEST == cms ]]; then composer require silverstripe/recipe-cms:4.6.x-dev --no-update; fi
- if [[ $PHPCS_TEST ]]; then composer global require squizlabs/php_codesniffer:^3 --prefer-dist --no-interaction --no-progress --no-suggest -o; fi - if [[ $PHPCS_TEST ]]; then composer global require squizlabs/php_codesniffer:^3 --prefer-dist --no-interaction --no-progress --no-suggest -o; fi
- composer install --prefer-source --no-interaction --no-progress --no-suggest --optimize-autoloader --verbose --profile - composer install --prefer-source --no-interaction --no-progress --no-suggest --optimize-autoloader --verbose --profile
@ -89,4 +89,3 @@ script:
after_success: after_success:
- if [[ $PHPUNIT_COVERAGE_TEST ]]; then bash <(curl -s https://codecov.io/bash) -f coverage.xml; fi - if [[ $PHPUNIT_COVERAGE_TEST ]]; then bash <(curl -s https://codecov.io/bash) -f coverage.xml; fi

3
composer.json
View File

@ -61,6 +61,9 @@
"psr/container-implementation": "1.0.0" "psr/container-implementation": "1.0.0"
}, },
"extra": { "extra": {
"branch-alias": {
"4.x-dev": "4.6.x-dev"
},
"expose": [ "expose": [
"client/images", "client/images",
"client/styles" "client/styles"