diff options
author | Nicolas LÅ“uillet <nicolas@loeuillet.org> | 2016-01-21 08:28:52 +0100 |
---|---|---|
committer | Nicolas LÅ“uillet <nicolas@loeuillet.org> | 2016-01-21 08:28:52 +0100 |
commit | ff1c7d16be07dd0749cf135ba6f633dafa78ba57 (patch) | |
tree | 914c7184d511b4e70d9d6b8f9dea2b406ba67f0f | |
parent | d481f42b7d383eb6211d1d3049d1a2c8288d9edb (diff) | |
parent | 173629a4002de5091f41cad4891cca6c8490a7ca (diff) | |
download | wallabag-ff1c7d16be07dd0749cf135ba6f633dafa78ba57.tar.gz wallabag-ff1c7d16be07dd0749cf135ba6f633dafa78ba57.tar.zst wallabag-ff1c7d16be07dd0749cf135ba6f633dafa78ba57.zip |
Merge pull request #1607 from wallabag/v2-composer-lock
Ignore composer.lock
-rw-r--r-- | .gitignore | 3 | ||||
-rw-r--r-- | build.xml | 2 |
2 files changed, 4 insertions, 1 deletions
@@ -35,3 +35,6 @@ data/db/wallabag*.sqlite | |||
35 | # Docker container logs and data | 35 | # Docker container logs and data |
36 | docker/logs/ | 36 | docker/logs/ |
37 | docker/data/ | 37 | docker/data/ |
38 | |||
39 | # To avoid crazy stuff on some PR, we must manually FORCE ADD IT on each new release | ||
40 | composer.lock | ||
@@ -11,7 +11,7 @@ | |||
11 | 11 | ||
12 | <target name="composer" description="Install deps using Composer"> | 12 | <target name="composer" description="Install deps using Composer"> |
13 | <exec executable="composer"> | 13 | <exec executable="composer"> |
14 | <arg value="install"/> | 14 | <arg value="up"/> |
15 | <arg value="--no-interaction"/> | 15 | <arg value="--no-interaction"/> |
16 | <arg value="--no-progress"/> | 16 | <arg value="--no-progress"/> |
17 | </exec> | 17 | </exec> |