Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

DevKit updates for master branch #120

Merged
merged 1 commit into from
May 29, 2016
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -67,3 +67,6 @@ before_script:
- if [ -x .travis/before_script_${TARGET}.sh ]; then .travis/before_script_${TARGET}.sh; fi;

script: make $TARGET

after_success:
- if [ -x .travis/after_success_${TARGET}.sh ]; then .travis/after_success_${TARGET}.sh; fi;
4 changes: 4 additions & 0 deletions .travis/after_success_test.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
#!/usr/bin/env sh
set -ev

coveralls -v
4 changes: 4 additions & 0 deletions .travis/install_test.sh
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,10 @@ fi
wget "https://phar.phpunit.de/${PHPUNIT_PHAR}" --output-document="${HOME}/bin/phpunit"
chmod u+x "${HOME}/bin/phpunit"

# Coveralls client install
wget https://github.com/satooshi/php-coveralls/releases/download/v1.0.1/coveralls.phar --output-document="${HOME}/bin/coveralls"
chmod u+x "${HOME}/bin/coveralls"

# To be removed when this issue will be resolved: https://github.com/composer/composer/issues/5355
if [ "${COMPOSER_FLAGS}" = '--prefer-lowest' ]; then
composer update --prefer-dist --no-interaction --prefer-stable --quiet
Expand Down
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ all:
@echo "Please choose a task."

test:
phpunit -c phpunit.xml.dist
phpunit -c phpunit.xml.dist --coverage-clover build/logs/clover.xml

docs:
cd Resources/doc && sphinx-build -W -b html -d _build/doctrees . _build/html
17 changes: 14 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,10 @@ Symfony SonataIntlBundle
[![Monthly Downloads](https://poser.pugx.org/sonata-project/intl-bundle/d/monthly)](https://packagist.org/packages/sonata-project/intl-bundle)
[![Daily Downloads](https://poser.pugx.org/sonata-project/intl-bundle/d/daily)](https://packagist.org/packages/sonata-project/intl-bundle)

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

master status: [![Build Status](https://travis-ci.org/sonata-project/SonataIntlBundle.svg?branch=master)](https://travis-ci.org/sonata-project/SonataIntlBundle)
Branch | Travis | Coveralls |
------ | ------ | --------- |
2.x | [![Build Status][travis_stable_badge]][travis_stable_link] | [![Coverage Status][coveralls_stable_badge]][coveralls_stable_link] |
master | [![Build Status][travis_unstable_badge]][travis_unstable_link] | [![Coverage Status][coveralls_unstable_badge]][coveralls_unstable_link] |

## Documentation

Expand All @@ -28,3 +29,13 @@ If you think you find a bug or you have a feature idea to propose, feel free to
## License

This package is available under the [MIT license](LICENSE).

[travis_stable_badge]: https://travis-ci.org/sonata-project/SonataIntlBundle.svg?branch=2.x
[travis_stable_link]: https://travis-ci.org/sonata-project/SonataIntlBundle
[travis_unstable_badge]: https://travis-ci.org/sonata-project/SonataIntlBundle.svg?branch=master
[travis_unstable_link]: https://travis-ci.org/sonata-project/SonataIntlBundle

[coveralls_stable_badge]: https://coveralls.io/repos/github/sonata-project/SonataIntlBundle/badge.svg?branch=2.x
[coveralls_stable_link]: https://coveralls.io/github/sonata-project/SonataIntlBundle?branch=2.x
[coveralls_unstable_badge]: https://coveralls.io/repos/github/sonata-project/SonataIntlBundle/badge.svg?branch=master
[coveralls_unstable_link]: https://coveralls.io/github/sonata-project/SonataIntlBundle?branch=master