From: Nicolas Lœuillet <nicolas@loeuillet.org>
Date: Thu, 21 Jan 2016 07:28:52 +0000 (+0100)
Subject: Merge pull request #1607 from wallabag/v2-composer-lock
X-Git-Tag: 2.0.0-alpha.2~5
X-Git-Url: https://git.immae.eu/?a=commitdiff_plain;h=ff1c7d16be07dd0749cf135ba6f633dafa78ba57;hp=d481f42b7d383eb6211d1d3049d1a2c8288d9edb;p=github%2Fwallabag%2Fwallabag.git

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

Ignore composer.lock
---

diff --git a/.gitignore b/.gitignore
index b6d6aa5d..02e921f8 100644
--- 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 ab8cac29..3d82770f 100644
--- 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>