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

Merge branch '4.4' into 4

This commit is contained in:
Robbie Averill 2019-04-21 11:28:07 +12:00
parent c3c38aa976 9b89812058
commit 1f1278b820
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.travis.yml
View File

@ -8,7 +8,7 @@ cache:
env: env:
global: global:
- COMPOSER_ROOT_VERSION=4.4.x-dev - COMPOSER_ROOT_VERSION=4.5.x-dev
- CORE_RELEASE=master - CORE_RELEASE=master
matrix: matrix:
@ -31,7 +31,7 @@ before_script:
- composer validate - composer validate
- if [[ $DB == PGSQL ]]; then composer require silverstripe/postgresql:2.1.x-dev --no-update; fi - if [[ $DB == PGSQL ]]; then composer require silverstripe/postgresql:2.1.x-dev --no-update; fi
- if [[ $DB == SQLITE ]]; then composer require silverstripe/sqlite3:2.0.x-dev --no-update; fi - if [[ $DB == SQLITE ]]; then composer require silverstripe/sqlite3:2.0.x-dev --no-update; fi
- composer require silverstripe/recipe-core:4.4.x-dev silverstripe/admin:1.4.x-dev silverstripe/versioned:1.4.x-dev --no-update - composer require silverstripe/recipe-core:4.5.x-dev silverstripe/admin:1.5.x-dev silverstripe/versioned:1.5.x-dev --no-update
- 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-dist --no-interaction --no-progress --no-suggest --optimize-autoloader --verbose --profile - composer install --prefer-dist --no-interaction --no-progress --no-suggest --optimize-autoloader --verbose --profile

2
composer.json
View File

@ -32,7 +32,7 @@
}, },
"extra": { "extra": {
"branch-alias": { "branch-alias": {
"4.x-dev": "4.4.x-dev" "4.x-dev": "4.5.x-dev"
}, },
"expose": [ "expose": [
"javascript" "javascript"