mirrors/wallabag
1
0
Fork 0
mirror of https://github.com/wallabag/wallabag.git synced 2024-11-25 10:31:05 +00:00
Code Issues Projects Releases Wiki Activity

Disable xdebug all the time

Browse source 
Use travis_wait to avoid travis timeout on `composer up`
Jump to `memory_limit -1` for `composer up`
Also, since composer.lock is ignored, we can remove it.
This commit is contained in:
Jeremy Benoist 2016-01-21 08:59:58 +01:00
parent eff6a406f3
commit 3ee1582e60
3 changed files with 8 additions and 6769 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
.travis.yml
View file

@ -39,12 +39,13 @@ branches:
- v2 - v2
before_script: before_script:
- composer self-update - if [[ $TRAVIS_PHP_VERSION != hhvm ]]; then echo "memory_limit=-1" >> ~/.phpenv/versions/$(phpenv version-name)/etc/conf.d/travis.ini; fi;
- if [[ $TRAVIS_PHP_VERSION != hhvm ]]; then phpenv config-rm xdebug.ini; fi;
- composer self-update --no-progress
- if [ -n "$GH_TOKEN" ]; then composer config github-oauth.github.com ${GH_TOKEN}; fi; - if [ -n "$GH_TOKEN" ]; then composer config github-oauth.github.com ${GH_TOKEN}; fi;
# disable xdebug since we don't use code-coverage for now
- if [[ $TRAVIS_PHP_VERSION != '5.6' && $TRAVIS_PHP_VERSION != 'hhvm' && $TRAVIS_PHP_VERSION != '7.0' ]]; then phpenv config-rm xdebug.ini; fi
- if [[ "$DB" = "pgsql" ]]; then psql -c 'create database wallabag;' -U postgres; fi; - if [[ "$DB" = "pgsql" ]]; then psql -c 'create database wallabag;' -U postgres; fi;
script: script:
- travis_wait composer update --no-interaction --no-progress
- ant prepare-$DB - ant prepare-$DB
- bin/phpunit -v - bin/phpunit -v

16
build.xml
View file

@ -1,22 +1,14 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<project name="wallabag" default="build"> <project name="wallabag" default="build">
<target name="build" depends="clean,composer,prepare,phpunit"/> <target name="build" depends="clean,prepare,phpunit"/>
<target name="prepare-mysql" depends="clean,composer,db_mysql,prepare"/> <target name="prepare-mysql" depends="clean,db_mysql,prepare"/>
<target name="prepare-sqlite" depends="clean,composer,db_sqlite,prepare"/> <target name="prepare-sqlite" depends="clean,db_sqlite,prepare"/>
<target name="prepare-pgsql" depends="clean,composer,db_pgsql,prepare"/> <target name="prepare-pgsql" depends="clean,db_pgsql,prepare"/>
<target name="clean" description="Cleanup build artifacts"> <target name="clean" description="Cleanup build artifacts">
<delete dir="${basedir}/var/cache"/> <delete dir="${basedir}/var/cache"/>
</target> </target>
<target name="composer" description="Install deps using Composer">
<exec executable="composer">
<arg value="up"/>
<arg value="--no-interaction"/>
<arg value="--no-progress"/>
</exec>
</target>
<target name="prepare" description="Prepare for build"> <target name="prepare" description="Prepare for build">
<exec executable="php"> <exec executable="php">
<arg value="${basedir}/bin/console"/> <arg value="${basedir}/bin/console"/>

6754
composer.lock generated
View file

File diff suppressed because it is too large Load diff