Skip to content

Commit

Permalink
improved testsetup (#100)
Browse files Browse the repository at this point in the history
  • Loading branch information
wachterjohannes authored Mar 17, 2017
1 parent 1e726f0 commit a3e475e
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 6 deletions.
11 changes: 6 additions & 5 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,16 +19,17 @@ matrix:
include:
- php: 5.5
env:
- SULU_VERSION="1.5.*"
# - COMPOSER_FLAGS="--prefer-lowest --prefer-dist --no-interaction"
- SULU_VERSION="~1.5.1"
- COMPOSER_FLAGS="--prefer-lowest --prefer-dist --no-interaction"
- php: 7.0
env:
# - COMPOSER_FLAGS="--prefer-dist --no-interaction"
- COMPOSER_FLAGS="--prefer-dist --no-interaction"
- SULU_VERSION="dev-develop"
- CODE_COVERAGE="--coverage-clover=coverage.clover"
- php: 7.0
env:
- SULU_VERSION="dev-master"
- COMPOSER_FLAGS="--prefer-dist --no-interaction"
- SULU_VERSION="~1.5.1"
- SYMFONY__PHPCR__TRANSPORT=jackrabbit

before_install:
Expand All @@ -55,7 +56,7 @@ install:
- ./Tests/app/console ongr:es:index:create -m live

script:
- ./vendor/bin/phpunit $CODE_COVERAGE --debug
- ./vendor/bin/phpunit $CODE_COVERAGE

after_script:
- if [[ -n $CODE_COVERAGE ]]; then wget https://scrutinizer-ci.com/ocular.phar ; fi
Expand Down
2 changes: 1 addition & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"license": "MIT",
"require": {
"php": "^5.5 || ^7.0",
"sulu/sulu": "^1.5 || dev-develop || dev-master",
"sulu/sulu": "^1.5.1 || dev-develop",
"sulu/document-manager": "@dev",
"massive/search-bundle": "@dev",
"ongr/elasticsearch-bundle": "~1.0"
Expand Down

0 comments on commit a3e475e

Please sign in to comment.