Ignore composer.lock

Having a big composer.lock on a final project can have side effect on incoming PR that add a new vendor.
Mostly because conflict are too frequent.

By ignoring composer.lock we ease the PR submission and rebase.

BUT we need to be careful when we release a new version of wallabag. We should manually `git add -f composer.lock` to update it.

Since composer.lock will no longer be commited I switch the `composer install` to a `composer up` in the travis configuration.
This commit is contained in:
Jeremy Benoist 2016-01-20 18:49:45 +01:00
parent d481f42b7d
commit 173629a400
2 changed files with 4 additions and 1 deletions

3
.gitignore vendored
View file

@ -35,3 +35,6 @@ data/db/wallabag*.sqlite
# Docker container logs and data
docker/logs/
docker/data/
# To avoid crazy stuff on some PR, we must manually FORCE ADD IT on each new release
composer.lock

View file

@ -11,7 +11,7 @@
<target name="composer" description="Install deps using Composer">
<exec executable="composer">
<arg value="install"/>
<arg value="up"/>
<arg value="--no-interaction"/>
<arg value="--no-progress"/>
</exec>