Merge pull request #1607 from wallabag/v2-composer-lock

Ignore composer.lock
2016-01-21 08:28:52 +01:00 · 2016-01-21 08:28:52 +01:00 · ff1c7d16be
commit ff1c7d16be
parent d481f42b7d 173629a400
2 changed files with 4 additions and 1 deletions
--- 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
--- 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>