Skip to content

Commit

Permalink
Merge pull request #659 from liip/mongo_db_build_issues
Browse files Browse the repository at this point in the history
skip MongoDB ODM related tests on PHP7 and HHVM
  • Loading branch information
lsmith77 committed Nov 1, 2015
2 parents 703ef5f + 9c90e1d commit 9b1194b
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 6 deletions.
7 changes: 2 additions & 5 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,14 +27,11 @@ matrix:
env: SYMFONY_VERSION=3.0.*@dev
- php: 5.3
env: COMPOSER_FLAGS="--prefer-lowest"
allow_failures:
- env: SYMFONY_VERSION=3.0.*@dev
- php: 7.0
- php: hhvm

before_install:
- yes '' | pecl -q install -f mongo
- sh -c 'if [ "${TRAVIS_PHP_VERSION}" != "hhvm" ]; then echo "memory_limit = -1" >> ~/.phpenv/versions/$(phpenv version-name)/etc/conf.d/travis.ini; fi;'
- sh -c 'if [ "${TRAVIS_PHP_VERSION}" != "hhvm" && "${TRAVIS_PHP_VERSION}" != "7.0" ]; then yes "" | pecl -q install -f mongo; fi;'
- sh -c 'if [ "${TRAVIS_PHP_VERSION}" != "hhvm" && "${TRAVIS_PHP_VERSION}" != "7.0" ]; then composer require --dev doctrine/mongodb-odm:~1.0 --no-update; fi;'
- composer self-update
- if [ "$SYMFONY_VERSION" != "" ]; then composer require "symfony/symfony:${SYMFONY_VERSION}" --no-update; fi;

Expand Down
1 change: 0 additions & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,6 @@
"symfony/phpunit-bridge": "~2.3|~3.0",
"symfony/dependency-injection": "~2.3|~3.0",
"doctrine/orm": "~2.3",
"doctrine/mongodb-odm": "~1.0",
"doctrine/cache": "~1.1",
"twig/twig": "~1.12",
"aws/aws-sdk-php": "~2.4",
Expand Down

0 comments on commit 9b1194b

Please sign in to comment.