From: Nicolas Lœuillet <nicolas@loeuillet.org>
Date: Sat, 19 Nov 2016 10:57:26 +0000 (+0100)
Subject: Merge pull request #2605 from wallabag/update-release-process
X-Git-Tag: 2.1.4~2
X-Git-Url: https://git.immae.eu/?a=commitdiff_plain;h=eabcd880ca543d0d6ac7f994c6f8ecddb557ab54;hp=a2261fbd7065ee3bfb2ea1e790dbba4d6f692663;p=github%2Fwallabag%2Fwallabag.git

Merge pull request #2605 from wallabag/update-release-process

Add .travis.yml change to RELEASE_PROCESS
---

diff --git a/RELEASE_PROCESS.md b/RELEASE_PROCESS.md
index 6873be49..51b9c4d0 100644
--- a/RELEASE_PROCESS.md
+++ b/RELEASE_PROCESS.md
@@ -20,7 +20,20 @@ git checkout master
 git pull origin master
 git checkout -b release-$LAST_WALLABAG_RELEASE
 SYMFONY_ENV=prod composer up --no-dev
-git add --force composer.lock
+```
+
+- Update `.travis.yml` file and replace the composer line with this one:
+
+```diff
+script:
+-    - travis_wait bash composer install -o  --no-interaction --no-progress --prefer-dist
++    - travis_wait composer update --no-interaction --no-progress
+```
+
+- Then continue with these commands:
+
+```
+git add --force composer.lock .travis.yml
 git commit -m "Release wallabag $LAST_WALLABAG_RELEASE"
 git push origin release-$LAST_WALLABAG_RELEASE
 ```