X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=RELEASE_PROCESS.md;h=7e43d9d69007f7f9217d1f6eb18f7263d4d6ad69;hb=63fb9d6f07d8c92afa7fd8cd11960b366b3cf2f1;hp=627bd844caf619e6dbdf5e86d1b61df7b66b228f;hpb=edc8bc0b2f23bf27ac33b9de079644cc9076579a;p=github%2Fwallabag%2Fwallabag.git

diff --git a/RELEASE_PROCESS.md b/RELEASE_PROCESS.md
index 627bd844..7e43d9d6 100644
--- a/RELEASE_PROCESS.md
+++ b/RELEASE_PROCESS.md
@@ -4,41 +4,53 @@ A release is mostly a git tag of http://github.com/wallabag/wallabag, following
 
 ### Steps to release
 
-During this documentation, we assume the release is `$LAST_WALLABAG_RELEASE`.
+During this documentation, we assume the release is `$LAST_WALLABAG_RELEASE` (like 2.3.4).
 
 #### 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 bash composer update -o --no-interaction --no-progress --prefer-dist
+```
+
+- 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 VERSION=$LAST_WALLABAG_RELEASE
+```
 
-- [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 downloads page](https://github.com/wallabag/wallabag.org/blob/master/content/pages/download.md) on the website (MD5 sum, release date)
+- [Create the new release on GitHub](https://github.com/wallabag/wallabag/releases/new) by targetting the `release-$LAST_WALLABAG_RELEASE` branch. You have to upload the package (generated previously).
+- Close the previously created pull request (**DO NOT MERGE IT**) and delete the `release-$LAST_WALLABAG_RELEASE` branch.
+- 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 Dockerfile https://github.com/wallabag/docker (and create a new tag)
-- Update wallabag.org website (downloads, releases and new blog post)
+- Update wallabag.org website (downloads, MD5 sum, 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`