Skip to content

Commit

Permalink
DevKit updates (#287)
Browse files Browse the repository at this point in the history
  • Loading branch information
SonataCI authored and OskarStark committed May 27, 2016
1 parent 9b3b351 commit bddf081
Show file tree
Hide file tree
Showing 4 changed files with 9 additions and 3 deletions.
4 changes: 4 additions & 0 deletions .travis/before_install_test.sh
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,10 @@ set -ev
if [ "${TRAVIS_PHP_VERSION}" != "hhvm" ]; then
mv "$HOME/.phpenv/versions/$(phpenv version-name)/etc/conf.d/xdebug.ini" /tmp
echo "memory_limit=3072M" >> ~/.phpenv/versions/$(phpenv version-name)/etc/conf.d/travis.ini

if [ ${TRAVIS_PHP_VERSION} '<' '7.0' ]; then
echo "extension=mongo.so" >> ~/.phpenv/versions/$(phpenv version-name)/etc/conf.d/travis.ini
fi
fi

# To be removed when following PR will be merged: https://github.com/travis-ci/travis-build/pull/718
Expand Down
2 changes: 1 addition & 1 deletion .travis/install_test.sh
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ wget "https://phar.phpunit.de/${PHPUNIT_PHAR}" --output-document="${HOME}/bin/ph
chmod u+x "${HOME}/bin/phpunit"

# To be removed when this issue will be resolved: https://github.com/composer/composer/issues/5355
if [ ${COMPOSER_FLAGS} = '--prefer-lowest' ]; then
if [ "${COMPOSER_FLAGS}" = '--prefer-lowest' ]; then
composer update --prefer-dist --no-interaction --prefer-stable --quiet
fi
composer update --prefer-dist --no-interaction --prefer-stable ${COMPOSER_FLAGS}
2 changes: 1 addition & 1 deletion CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -130,7 +130,7 @@ Notes:
* If your BC PR is accepted, you can do a new one on the `master` branch which remove the deprecated code.
* SYMFONY DOC REF (same logic)?

If you have a non-BC PR to propose, please first try to create a related BC PR first.
If you have a non-BC PR to propose, please try to create a related BC PR first.
This BC PR should mark every piece of code that needs to be removed / uncommented / reworked
in the corresponding non-BC PR with the following marker comment : `NEXT_MAJOR`.
When the BC PR is merged in the stable branch, wait for the stable branch to be
Expand Down
4 changes: 3 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,9 @@ Symfony SonataBlockBundle
[![Monthly Downloads](https://poser.pugx.org/sonata-project/block-bundle/d/monthly)](https://packagist.org/packages/sonata-project/block-bundle)
[![Daily Downloads](https://poser.pugx.org/sonata-project/block-bundle/d/daily)](https://packagist.org/packages/sonata-project/block-bundle)

[![Build Status](https://travis-ci.org/sonata-project/SonataBlockBundle.svg?branch=3.x)](https://travis-ci.org/sonata-project/SonataBlockBundle)
3.x status: [![Build Status](https://travis-ci.org/sonata-project/SonataBlockBundle.svg?branch=3.x)](https://travis-ci.org/sonata-project/SonataBlockBundle)

master status: [![Build Status](https://travis-ci.org/sonata-project/SonataBlockBundle.svg?branch=master)](https://travis-ci.org/sonata-project/SonataBlockBundle)

## Documentation

Expand Down

0 comments on commit bddf081

Please sign in to comment.