Skip to content

Commit 0b74576

Browse files
committed
Update branch alias and travis
1 parent 5232b87 commit 0b74576

File tree

2 files changed

+7
-5
lines changed

2 files changed

+7
-5
lines changed

.travis.yml

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ addons:
1313

1414
env:
1515
global:
16-
- COMPOSER_ROOT_VERSION=4.5.x-dev
16+
- COMPOSER_ROOT_VERSION=4.6.x-dev
1717

1818
matrix:
1919
fast_finish: true
@@ -69,10 +69,10 @@ before_script:
6969
# Install composer dependencies
7070
- composer validate
7171
- mkdir ./public
72-
- if [[ $DB == PGSQL ]]; then composer require silverstripe/postgresql:2.2.x-dev --no-update; fi
72+
- if [[ $DB == PGSQL ]]; then composer require silverstripe/postgresql:2.4.x-dev --no-update; fi
7373
- if [[ $DB == SQLITE ]]; then composer require silverstripe/sqlite3:2.2.x-dev --no-update; fi
74-
- 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
75-
- if [[ $PHPUNIT_TEST == cms ]]; then composer require silverstripe/recipe-cms:4.5.x-dev --no-update; fi
74+
- 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
75+
- if [[ $PHPUNIT_TEST == cms ]]; then composer require silverstripe/recipe-cms:4.6.x-dev --no-update; fi
7676
- if [[ $PHPCS_TEST ]]; then composer global require squizlabs/php_codesniffer:^3 --prefer-dist --no-interaction --no-progress --no-suggest -o; fi
7777
- composer install --prefer-source --no-interaction --no-progress --no-suggest --optimize-autoloader --verbose --profile
7878

@@ -89,4 +89,3 @@ script:
8989

9090
after_success:
9191
- if [[ $PHPUNIT_COVERAGE_TEST ]]; then bash <(curl -s https://codecov.io/bash) -f coverage.xml; fi
92-

composer.json

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,9 @@
6161
"psr/container-implementation": "1.0.0"
6262
},
6363
"extra": {
64+
"branch-alias": {
65+
"4.x-dev": "4.6.x-dev"
66+
},
6467
"expose": [
6568
"client/images",
6669
"client/styles"

0 commit comments

Comments
 (0)