Skip to content

Commit

Permalink
Update composer.json and travis configs
Browse files Browse the repository at this point in the history
  • Loading branch information
dnsl48 committed Nov 11, 2019
1 parent 7b0d579 commit e4346fa
Show file tree
Hide file tree
Showing 2 changed files with 18 additions and 20 deletions.
29 changes: 15 additions & 14 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,30 +1,31 @@
# See https://github.com/silverstripe-labs/silverstripe-travis-support for setup details

sudo: false

language: php

php:
- 5.6
dist: xenial

services:
- mysql

env:
- DB=MYSQL CORE_RELEASE=4
global:
- COMPOSER_ROOT_VERSION="5.x-dev"

matrix:
include:
- php: 5.6
env: DB=PGSQL CORE_RELEASE=4
- php: 7.0
env: DB=MYSQL CORE_RELEASE=4
- php: 7.1
env: DB=MYSQL CORE_RELEASE=4 PHPUNIT_TEST=1
env: DB=MYSQL PHPUNIT_TEST=1
- php: 7.1
env: DB=PGSQL PHPUNIT_TEST=1
- php: 7.2
env: DB=MYSQL PHPUNIT_TEST=1
- php: 7.3
env: DB=MYSQL PHPUNIT_TEST=1

before_script:
- phpenv rehash
- phpenv config-rm xdebug.ini
- composer validate
- composer require --no-update silverstripe/recipe-cms:1.0.x-dev
- if [[ $DB == PGSQL ]]; then composer require --no-update silverstripe/postgresql:2.0.x-dev; fi
- composer require --no-update silverstripe/recipe-cms:^4
- if [[ $DB == PGSQL ]]; then composer require --no-update silverstripe/postgresql:^2; fi
- composer install --prefer-dist --no-interaction --no-progress --no-suggest --optimize-autoloader --verbose --profile

script:
Expand Down
9 changes: 3 additions & 6 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,19 +15,16 @@
}
],
"require": {
"silverstripe/framework": "~4.0"
"silverstripe/framework": "^4"
},
"require-dev": {
"phpunit/PHPUnit": "^5.7"
"phpunit/phpunit": "^5.7"
},
"extra": {
"expose": [
"client"
],
"installer-name": "multivaluefield",
"branch-alias": {
"dev-master": "5.0.x-dev"
}
"installer-name": "multivaluefield"
},
"replace": {
"silverstripe/multivaluefield": "self.version"
Expand Down

0 comments on commit e4346fa

Please sign in to comment.