Fix documentation wording for matches/notmatches tagging rules

[github/wallabag/wallabag.git] / RELEASE_PROCESS.md

diff --git a/RELEASE_PROCESS.md b/RELEASE_PROCESS.md
index 627bd844caf619e6dbdf5e86d1b61df7b66b228f..38dd5a7c80c43c06540ff3c8daa7dbdc89819d1e 100644 (file)
--- a/RELEASE_PROCESS.md
+++ b/RELEASE_PROCESS.md
@@ -8,37 +8,50 @@ During this documentation, we assume the release is `$LAST_WALLABAG_RELEASE`.
 
 #### Files to edit
 
-- `app/config/config.yml` (`wallabag_core.version`)
-- `CHANGELOG.md` (by using this command `github_changelog_generator --no-compare-link`. [github-changelog-generator is available here](https://github.com/skywinder/github-changelog-generator))
+- `app/config/wallabag.yml` (`wallabag_core.version`)
+- `CHANGELOG.md`
 
 #### Create release on GitHub
 
 - Run these commands to create the tag:
 
- ```
- 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
- git commit -m "Release wallabag $LAST_WALLABAG_RELEASE"
- git push origin release-$LAST_WALLABAG_RELEASE
- ```
+```
+git checkout master
+git pull origin master
+git checkout -b release-$LAST_WALLABAG_RELEASE
+SYMFONY_ENV=prod composer up --no-dev
+```
+
+- 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
+```
 
 - Create a new pull request with this title `DON'T MERGE Release wallabag $LAST_WALLABAG_RELEASE`. This pull request is used to launch builds on Travis-CI.
-- Run these commands to create the package (you need to clone `https://github.com/wallabag/releaser`) :
+- Run these command to create the package:
 
- ```
- cd releaser/
- ./releaser.sh $LAST_WALLABAG_RELEASE
- ```
+```
+make release master /tmp wllbg-release prod
+```
 
 - [Create the new release on GitHub](https://github.com/wallabag/wallabag/releases/new). You have to upload on this page the package.
 - Delete the `release-$LAST_WALLABAG_RELEASE` branch and close the pull request (**DO NOT MERGE IT**).
-- Update the URL shortener (used on `wllbg.org` to generate links like `http://wllbg.org/latest-v2-package` or `http://wllbg.org/latest-v2`)
+- Update the URL shortener (used on `wllbg.org` to generate links like `https://wllbg.org/latest-v2-package` or `http://wllbg.org/latest-v2`)
 - Update [the downloads page](https://github.com/wallabag/wallabag.org/blob/master/content/pages/download.md) on the website (MD5 sum, release date)
 - Update Dockerfile https://github.com/wallabag/docker (and create a new tag)
 - Update wallabag.org website (downloads, releases and new blog post)
+- Put the next patch version suffixed with `-dev` in `app/config/config.yml` (`wallabag_core.version`)
 - Drink a :beer:!
 
 ### `composer.lock`