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.

diff --git a/.gitignore b/.gitignore
index b6d6aa5d568f2cce10d5d206ccf2d8778280756a..02e921f8d0accce39ad7aa53e1882a7ec588b3b0 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -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

diff --git a/build.xml b/build.xml
index ab8cac29a4cf704ce7fd619215f5d66a7aef80a1..3d82770fcb2d658964fa056000cb0d6b14863cd1 100644 (file)
--- a/build.xml
+++ b/build.xml
@@ -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>