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

Merge pull request #122 from creative-commoners/pulls/4/rfc-9344

Browse Source 
RFC-9344 Remove branch aliases
This commit is contained in:
Robbie Averill 2019-12-09 09:57:51 -08:00 committed by GitHub
commit 34474804a2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
.travis.yml
View File

@ -8,7 +8,7 @@ cache:
env:
global:
- COMPOSER_ROOT_VERSION=4.6.x-dev
- COMPOSER_ROOT_VERSION=4.x-dev
- CORE_RELEASE=master
matrix:
@ -29,9 +29,9 @@ before_script:
# Install composer dependencies
- export PATH=~/.composer/vendor/bin:$PATH
- composer validate
- 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
- composer require silverstripe/recipe-core:4.6.x-dev silverstripe/admin:1.6.x-dev silverstripe/versioned:1.6.x-dev --no-update
- if [[ $DB == PGSQL ]]; then composer require silverstripe/postgresql:2.x-dev --no-update; fi
- if [[ $DB == SQLITE ]]; then composer require silverstripe/sqlite3:2.x-dev --no-update; fi
- composer require silverstripe/recipe-core:4.x-dev silverstripe/admin:1.x-dev silverstripe/versioned:1.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
- composer install --prefer-dist --no-interaction --no-progress --no-suggest --optimize-autoloader --verbose --profile

3
composer.json
View File

@ -31,9 +31,6 @@
"phpunit/phpunit": "^5.7"
},
"extra": {
"branch-alias": {
"4.x-dev": "4.6.x-dev"
},
"expose": [
"javascript"
]