Skip to content

Commit

Permalink
Merge branch '2.0'
Browse files Browse the repository at this point in the history
  • Loading branch information
robbieaverill committed Jun 27, 2018
2 parents 46ca564 + cecbb83 commit 94408ac
Showing 1 changed file with 3 additions and 2 deletions.
5 changes: 3 additions & 2 deletions .travis.yml
Expand Up @@ -11,7 +11,7 @@ matrix:
- php: 5.6
env: DB=MYSQL RECIPE_VERSION=1.1.x-dev PHPUNIT_TEST=1
- php: 7.0
env: DB=PGSQL RECIPE_VERSION=1.1.x-dev PHPUNIT_TEST=1
env: DB=PGSQL RECIPE_VERSION=1.2.x-dev PHPUNIT_TEST=1
- php: 7.1
env: DB=PGSQL RECIPE_VERSION=1.2.x-dev PHPUNIT_COVERAGE_TEST=1
- php: 7.2
Expand All @@ -24,7 +24,8 @@ before_script:
- echo 'memory_limit=2G' >> ~/.phpenv/versions/$(phpenv version-name)/etc/conf.d/travis.ini

- composer require --no-update silverstripe/recipe-cms "$RECIPE_VERSION"
- if [[ $DB == PGSQL ]]; then composer require --no-update silverstripe/postgresql:2.0.x-dev; fi
# Note: Postgres version is for SilverStripe >= 4.2.x
- if [[ $DB == PGSQL ]]; then composer require --no-update silverstripe/postgresql:2.1.x-dev; fi
- composer install --prefer-dist --no-interaction --no-progress --no-suggest --optimize-autoloader --verbose --profile

script:
Expand Down

0 comments on commit 94408ac

Please sign in to comment.