Skip to content

Commit

Permalink
Travis config update, remove branch aliases
Browse files Browse the repository at this point in the history
  • Loading branch information
dnsl48 committed Nov 5, 2019
1 parent 3746cb1 commit 81f36c6
Show file tree
Hide file tree
Showing 2 changed files with 14 additions and 15 deletions.
24 changes: 13 additions & 11 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,19 +1,21 @@
language: php

dist: trusty
dist: xenial

services:
- mysql
- postgresql

matrix:
include:
- php: '5.6'
env: DB=MYSQL RECIPE_VERSION=4.3.x-dev PHPCS_TEST=1 PHPUNIT_TEST=1
- php: '7.0'
env: DB=MYSQL RECIPE_VERSION=4.3.x-dev PHPUNIT_TEST=1
- php: '7.1'
env: DB=PGSQL RECIPE_VERSION=4.4.x-dev PHPUNIT_COVERAGE_TEST=1
env: DB=MYSQL PHPCS_TEST=1 PHPUNIT_TEST=1
- php: '7.1'
env: DB=PGSQL PHPUNIT_COVERAGE_TEST=1
- php: '7.2'
env: DB=MYSQL RECIPE_VERSION=4.5.x-dev PHPUNIT_TEST=1
env: DB=MYSQL PHPUNIT_TEST=1
- php: '7.3'
env: DB=MYSQL RECIPE_VERSION=4.x-dev PHPUNIT_TEST=1
env: DB=MYSQL PHPUNIT_TEST=1

before_script:
# Init PHP
Expand All @@ -22,9 +24,9 @@ before_script:

# Install composer dependencies
- composer validate
- composer require --no-update silverstripe/recipe-cms $RECIPE_VERSION
- if [[ $DB == PGSQL ]]; then composer require --no-update silverstripe/postgresql 2.x-dev; fi
- composer install --prefer-dist --no-interaction --no-progress --no-suggest --optimize-autoloader --verbose --profile
- composer require --no-update silverstripe/recipe-cms:^4
- if [[ $DB == PGSQL ]]; then composer require --no-update silverstripe/postgresql:^2; fi
- composer install --prefer-source --no-interaction --no-progress --no-suggest --optimize-autoloader --verbose --profile

script:
- if [[ $PHPUNIT_TEST ]]; then vendor/bin/phpunit; fi
Expand Down
5 changes: 1 addition & 4 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -30,10 +30,7 @@
"expose": [
"css",
"javascript"
],
"branch-alias": {
"dev-master": "2.x-dev"
}
]
},
"minimum-stability": "dev",
"prefer-stable": true
Expand Down

0 comments on commit 81f36c6

Please sign in to comment.