aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
-rw-r--r--RELEASE_PROCESS.md15
-rw-r--r--composer.json4
2 files changed, 16 insertions, 3 deletions
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
20git pull origin master 20git pull origin master
21git checkout -b release-$LAST_WALLABAG_RELEASE 21git checkout -b release-$LAST_WALLABAG_RELEASE
22SYMFONY_ENV=prod composer up --no-dev 22SYMFONY_ENV=prod composer up --no-dev
23git add --force composer.lock 23```
24
25- Update `.travis.yml` file and replace the composer line with this one:
26
27```diff
28script:
29- - travis_wait bash composer install -o --no-interaction --no-progress --prefer-dist
30+ - travis_wait composer update --no-interaction --no-progress
31```
32
33- Then continue with these commands:
34
35```
36git add --force composer.lock .travis.yml
24git commit -m "Release wallabag $LAST_WALLABAG_RELEASE" 37git commit -m "Release wallabag $LAST_WALLABAG_RELEASE"
25git push origin release-$LAST_WALLABAG_RELEASE 38git push origin release-$LAST_WALLABAG_RELEASE
26``` 39```
diff --git a/composer.json b/composer.json
index 79de337b..4f7ad291 100644
--- a/composer.json
+++ b/composer.json
@@ -54,8 +54,8 @@
54 "sensio/framework-extra-bundle": "^3.0.2", 54 "sensio/framework-extra-bundle": "^3.0.2",
55 "incenteev/composer-parameter-handler": "^2.0", 55 "incenteev/composer-parameter-handler": "^2.0",
56 "nelmio/cors-bundle": "~1.4.0", 56 "nelmio/cors-bundle": "~1.4.0",
57 "friendsofsymfony/rest-bundle": "~1.4", 57 "friendsofsymfony/rest-bundle": "~2.1",
58 "jms/serializer-bundle": "~1.0", 58 "jms/serializer-bundle": "~1.1",
59 "nelmio/api-doc-bundle": "~2.7", 59 "nelmio/api-doc-bundle": "~2.7",
60 "mgargano/simplehtmldom": "~1.5", 60 "mgargano/simplehtmldom": "~1.5",
61 "tecnickcom/tcpdf": "~6.2", 61 "tecnickcom/tcpdf": "~6.2",