Skip to content

Commit

Permalink
Merge 6044863 into 3c943c4
Browse files Browse the repository at this point in the history
  • Loading branch information
SonataCI committed May 28, 2016
2 parents 3c943c4 + 6044863 commit 45aa495
Show file tree
Hide file tree
Showing 5 changed files with 26 additions and 4 deletions.
3 changes: 3 additions & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -70,3 +70,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 Sonata / Integrate Doctrine ORM into the SonataAdminBundle
[![Monthly Downloads](https://poser.pugx.org/sonata-project/doctrine-orm-admin-bundle/d/monthly)](https://packagist.org/packages/sonata-project/doctrine-orm-admin-bundle)
[![Daily Downloads](https://poser.pugx.org/sonata-project/doctrine-orm-admin-bundle/d/daily)](https://packagist.org/packages/sonata-project/doctrine-orm-admin-bundle)

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

master status: [![Build Status](https://travis-ci.org/sonata-project/SonataDoctrineORMAdminBundle.svg?branch=master)](https://travis-ci.org/sonata-project/SonataDoctrineORMAdminBundle)
Branch | Travis | Coveralls |
------ | ------ | --------- |
3.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/SonataDoctrineORMAdminBundle.svg?branch=3.x
[travis_stable_link]: https://travis-ci.org/sonata-project/SonataDoctrineORMAdminBundle
[travis_unstable_badge]: https://travis-ci.org/sonata-project/SonataDoctrineORMAdminBundle.svg?branch=master
[travis_unstable_link]: https://travis-ci.org/sonata-project/SonataDoctrineORMAdminBundle

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

0 comments on commit 45aa495

Please sign in to comment.