Merge pull request #1144 from wallabag/v2-build

Simplify build system
This commit is contained in:
Nicolas Lœuillet 2015-03-04 06:25:17 +01:00
commit 73b7744383
4 changed files with 21 additions and 18 deletions

6
.gitignore vendored
View File

@ -26,9 +26,9 @@
/web/bundles/
/web/uploads/
# PHPUnit
/app/phpunit.xml
/phpunit.xml
# Build
/app/build
/build
# Composer PHAR
/composer.phar

View File

@ -14,5 +14,5 @@ before_script:
- echo 'date.timezone = "Europe/Paris"' >> ~/.phpenv/versions/$(phpenv version-name)/etc/php.ini
script:
- ant -f app/build.xml prepare
- phpunit -c app --coverage-text
- ant prepare
- phpunit --coverage-text

View File

@ -11,31 +11,30 @@
<arg value="install"/>
<arg value="--no-interaction"/>
<arg value="--no-progress"/>
<arg value="--working-dir=.."/>
</exec>
<exec executable="php">
<arg value="${basedir}/../app/console"/>
<arg value="${basedir}/app/console"/>
<arg value="doctrine:database:drop"/>
<arg value="--force"/>
<arg value="--env=test"/>
</exec>
<exec executable="php">
<arg value="${basedir}/../app/console"/>
<arg value="${basedir}/app/console"/>
<arg value="doctrine:database:create"/>
<arg value="--env=test"/>
</exec>
<exec executable="php">
<arg value="${basedir}/../app/console"/>
<arg value="${basedir}/app/console"/>
<arg value="doctrine:schema:create"/>
<arg value="--env=test"/>
</exec>
<exec executable="php">
<arg value="${basedir}/../app/console"/>
<arg value="${basedir}/app/console"/>
<arg value="cache:clear"/>
<arg value="--env=test"/>
</exec>
<exec executable="php">
<arg value="${basedir}/../app/console"/>
<arg value="${basedir}/app/console"/>
<arg value="doctrine:fixtures:load"/>
<arg value="--no-interaction"/>
<arg value="--env=test"/>

View File

@ -9,23 +9,27 @@
processIsolation="false"
stopOnFailure="false"
syntaxCheck="false"
bootstrap="bootstrap.php.cache"
bootstrap="app/bootstrap.php.cache"
>
<testsuites>
<testsuite name="wallabag Test Suite">
<directory>../src/Wallabag/CoreBundle/Tests</directory>
<directory>./src/Wallabag/*Bundle/Tests</directory>
</testsuite>
</testsuites>
<php>
<server name="KERNEL_DIR" value="./app/" />
</php>
<filter>
<whitelist>
<directory>../src</directory>
<directory>./src</directory>
<exclude>
<directory>../vendor</directory>
<directory>../src/Wallabag/CoreBundle/Resources</directory>
<directory>../src/Wallabag/CoreBundle/Tests</directory>
<directory>../src/Wallabag/CoreBundle/DataFixtures</directory>
<directory>./vendor</directory>
<directory>./src/Wallabag/*Bundle/Resources</directory>
<directory>./src/Wallabag/*Bundle/Tests</directory>
<directory>./src/Wallabag/*Bundle/DataFixtures</directory>
</exclude>
</whitelist>
</filter>