Skip to content

Commit

Permalink
Merge pull request #25 from open-sausages/pulls/2/target-recipe-5x-de…
Browse files Browse the repository at this point in the history
…v-in-travis

Install 5.x-dev recipe when testing master.
  • Loading branch information
robbieaverill authored Jul 1, 2018
2 parents 9b3fb59 + 1016d06 commit 4c982ed
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 9 deletions.
12 changes: 4 additions & 8 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,17 +15,13 @@ env:

matrix:
include:
- php: 5.6
env: DB=PGSQL PHPUNIT_TEST=1 PHPCS_TEST=1
- php: 7.0
env: DB=MYSQL PHPUNIT_TEST=1
- php: 7.1
env: DB=MYSQL PDO=1 PHPUNIT_COVERAGE_TEST=1
- php: 7.2
env: DB=MYSQL PHPUNIT_TEST=1
- php: 7.2
env: DB=MYSQL NPM_TEST=1
- php: 7.0
env: DB=PGSQL PHPUNIT_TEST=1 PHPCS_TEST=1 NPM_TEST=1
- php: 7.1
env: DB=MYSQL BEHAT_TEST=1

before_script:
Expand All @@ -40,8 +36,8 @@ before_script:

# Install composer
- composer validate
- if [[ $DB == PGSQL ]]; then composer require --prefer-dist --no-update silverstripe/postgresql 2.0.x-dev; fi
- composer require --no-update silverstripe/recipe-testing:^1 silverstripe/recipe-cms 1.2.x-dev
- if [[ $DB == PGSQL ]]; then composer require --prefer-dist --no-update silverstripe/postgresql 3.x-dev; fi
- composer require --no-update silverstripe/recipe-testing:^2 silverstripe/recipe-cms 5.x-dev
- composer install --prefer-source

# Behat bootstrapping
Expand Down
2 changes: 1 addition & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
"silverstripe/vendor-plugin": "^1"
},
"require-dev": {
"phpunit/phpunit": "^5",
"phpunit/phpunit": "^7",
"squizlabs/php_codesniffer": "^3",
"silverstripe/cms": "^5@dev"
},
Expand Down

0 comments on commit 4c982ed

Please sign in to comment.