tonyair/recipe-cms
1
0
Fork 0
mirror of https://github.com/silverstripe/recipe-cms.git synced 2024-10-22 08:05:52 +02:00
Code Issues Projects Releases Wiki Activity

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

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

4
.travis.yml
View File

@ -8,7 +8,7 @@ services:
env:
global:
- COMPOSER_ROOT_VERSION=4.6.x-dev
- COMPOSER_ROOT_VERSION=4.x-dev
matrix:
include:
@ -27,7 +27,7 @@ before_script:
- composer validate
- composer require --no-update silverstripe-themes/simple:~3.2.0
- if [[ $DB == PGSQL ]]; then composer require silverstripe/postgresql:2.4.x-dev --no-update; fi
- if [[ $DB == PGSQL ]]; then composer require silverstripe/postgresql:2.x-dev --no-update; fi
- composer install --prefer-source --no-interaction --no-progress --no-suggest --optimize-autoloader --verbose --profile
# Validate cow schema

25
composer.json
View File

@ -6,25 +6,22 @@
"license": "BSD-3-Clause",
"require": {
"silverstripe/recipe-plugin": "^1.2",
"silverstripe/recipe-core": "4.6.x-dev",
"silverstripe/admin": "1.6.x-dev",
"silverstripe/asset-admin": "1.6.x-dev",
"silverstripe/campaign-admin": "1.6.x-dev",
"silverstripe/versioned-admin": "1.4.x-dev",
"silverstripe/cms": "4.6.x-dev",
"silverstripe/errorpage": "1.6.x-dev",
"silverstripe/graphql": "3.3.x-dev",
"silverstripe/reports": "4.6.x-dev",
"silverstripe/siteconfig": "4.6.x-dev",
"silverstripe/versioned": "1.6.x-dev"
"silverstripe/recipe-core": "4.x-dev",
"silverstripe/admin": "1.x-dev",
"silverstripe/asset-admin": "1.x-dev",
"silverstripe/campaign-admin": "1.x-dev",
"silverstripe/versioned-admin": "1.x-dev",
"silverstripe/cms": "4.x-dev",
"silverstripe/errorpage": "1.x-dev",
"silverstripe/graphql": "3.x-dev",
"silverstripe/reports": "4.x-dev",
"silverstripe/siteconfig": "4.x-dev",
"silverstripe/versioned": "1.x-dev"
},
"require-dev": {
"phpunit/phpunit": "^5.7"
},
"extra": {
"branch-alias": {
"4.x-dev": "4.6.x-dev"
},
"project-files": [
"app/src/*"
],