From 3b1bf6343dcbf357bb25a6edbec42075e4eb2954 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nicolas=20L=C5=93uillet?= Date: Fri, 7 Oct 2016 15:30:25 +0200 Subject: Update release process --- RELEASE_PROCESS.md | 1 + 1 file changed, 1 insertion(+) (limited to 'RELEASE_PROCESS.md') diff --git a/RELEASE_PROCESS.md b/RELEASE_PROCESS.md index 45e60546..359bc921 100644 --- a/RELEASE_PROCESS.md +++ b/RELEASE_PROCESS.md @@ -12,6 +12,7 @@ During this documentation, we assume the release is `release-2.0.0-beta.1`. - `app/config/config.yml` (`wallabag_core.version`) - `README.md` (`composer create-project` command) - `docs/en/user/installation.rst` and its translations (`composer create-project` command) +- `CHANGELOG.md` (by using this command `github_changelog_generator --no-compare-link --future-release "2.x.x"`. [github-changelog-generator is available here](https://github.com/skywinder/github-changelog-generator)) #### Create release on GitHub -- cgit v1.2.3 From 7eff4736a1309ad71a75fa74dc1081a3b2303169 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nicolas=20L=C5=93uillet?= Date: Sat, 8 Oct 2016 15:10:56 +0200 Subject: Cleaned up documentation for installation process --- RELEASE_PROCESS.md | 33 +++++++++++++++------------------ 1 file changed, 15 insertions(+), 18 deletions(-) (limited to 'RELEASE_PROCESS.md') diff --git a/RELEASE_PROCESS.md b/RELEASE_PROCESS.md index 359bc921..79e3a40e 100644 --- a/RELEASE_PROCESS.md +++ b/RELEASE_PROCESS.md @@ -1,48 +1,45 @@ ## Definition A release is mostly a git tag of http://github.com/wallabag/wallabag, following [semantic versioning](http://semver.org). -The last release at the time of writing is 2.0.0-alpha.2, from the v2 branch. ### Steps to release -During this documentation, we assume the release is `release-2.0.0-beta.1`. +During this documentation, we assume the release is `$LAST_WALLABAG_RELEASE`. #### Files to edit - `app/config/config.yml` (`wallabag_core.version`) -- `README.md` (`composer create-project` command) -- `docs/en/user/installation.rst` and its translations (`composer create-project` command) -- `CHANGELOG.md` (by using this command `github_changelog_generator --no-compare-link --future-release "2.x.x"`. [github-changelog-generator is available here](https://github.com/skywinder/github-changelog-generator)) +- `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)) #### Create release on GitHub - Run these commands to create the tag: ``` - git checkout v2 - git pull origin v2 - git checkout -b release-2.0.0-beta.1 + 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 add README.md - git commit -m "Release wallabag 2.0.0-beta.1" - git push origin release-2.0.0-beta.1 + 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 2.0.0-beta.1`. This pull request is used to launch builds on Travis-CI. -- Run these commands to create the package: +- 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`) : ``` - git clone git@github.com:wallabag/wallabag.git -b release-2.0.0-beta.1 release-2.0.0-beta.1 - SYMFONY_ENV=prod composer up -d=release-2.0.0-beta.1 --no-dev - tar czf wallabag-release-2.0.0-beta.1.tar.gz --exclude="var/*" --exclude=".git" release-2.0.0-beta.1 + cd releaser/ + ./releaser.sh $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-2.0.0-beta.1` branch and close the pull request (**DO NOT MERGE IT**). +- 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) -- Drink a beer! +- Update Dockerfile https://github.com/wallabag/docker (and create a new tag) +- Update wallabag.org website (downloads, releases and new blog post) +- Drink a :beer:! ### `composer.lock` A release tag must contain a `composer.lock` file. It sets which dependencies were available at the time a release was done, -- cgit v1.2.3 From edc8bc0b2f23bf27ac33b9de079644cc9076579a Mon Sep 17 00:00:00 2001 From: Jeremy Benoist Date: Mon, 10 Oct 2016 09:12:24 +0200 Subject: Update RELEASE_PROCESS.md --- RELEASE_PROCESS.md | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) (limited to 'RELEASE_PROCESS.md') diff --git a/RELEASE_PROCESS.md b/RELEASE_PROCESS.md index 79e3a40e..627bd844 100644 --- a/RELEASE_PROCESS.md +++ b/RELEASE_PROCESS.md @@ -15,23 +15,23 @@ During this documentation, we assume the release is `$LAST_WALLABAG_RELEASE`. - 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 + git add --force composer.lock + 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`) : -``` - cd releaser/ - ./releaser.sh $LAST_WALLABAG_RELEASE -``` + ``` + cd releaser/ + ./releaser.sh $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**). -- cgit v1.2.3 From 7c1225347db8b516cc268709939f6b359bc283c1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nicolas=20L=C5=93uillet?= Date: Mon, 10 Oct 2016 10:20:32 +0200 Subject: Update documentation --- RELEASE_PROCESS.md | 27 +++++++++++++-------------- 1 file changed, 13 insertions(+), 14 deletions(-) (limited to 'RELEASE_PROCESS.md') diff --git a/RELEASE_PROCESS.md b/RELEASE_PROCESS.md index 627bd844..767f5e26 100644 --- a/RELEASE_PROCESS.md +++ b/RELEASE_PROCESS.md @@ -15,23 +15,22 @@ During this documentation, we assume the release is `$LAST_WALLABAG_RELEASE`. - 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 +git add --force composer.lock +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 releas emaster /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**). -- cgit v1.2.3 From 6b1317a627686fea33662f56fa08231b7793803a Mon Sep 17 00:00:00 2001 From: Jeremy Benoist Date: Mon, 10 Oct 2016 11:39:42 +0200 Subject: Add -dev version Following https://github.com/wallabag/wallabag/pull/2417 --- RELEASE_PROCESS.md | 1 + 1 file changed, 1 insertion(+) (limited to 'RELEASE_PROCESS.md') diff --git a/RELEASE_PROCESS.md b/RELEASE_PROCESS.md index 767f5e26..15855bc7 100644 --- a/RELEASE_PROCESS.md +++ b/RELEASE_PROCESS.md @@ -38,6 +38,7 @@ make releas emaster /tmp wllbg-release prod - 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` -- cgit v1.2.3 From ed11d7f7319dbc3ad9ea8265179f0f32d7d9ef6c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nicolas=20L=C5=93uillet?= Date: Mon, 10 Oct 2016 13:01:14 +0200 Subject: Added page about parameters.yml --- RELEASE_PROCESS.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'RELEASE_PROCESS.md') diff --git a/RELEASE_PROCESS.md b/RELEASE_PROCESS.md index 15855bc7..8ac9bbcd 100644 --- a/RELEASE_PROCESS.md +++ b/RELEASE_PROCESS.md @@ -29,7 +29,7 @@ git push origin release-$LAST_WALLABAG_RELEASE - Run these command to create the package: ``` -make releas emaster /tmp wllbg-release prod +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. -- cgit v1.2.3 From fd54f236f4d3fbb83a9f1feea0d0d0ac845bf8ca Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nicolas=20L=C5=93uillet?= Date: Mon, 17 Oct 2016 10:23:34 +0200 Subject: Update release process --- RELEASE_PROCESS.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'RELEASE_PROCESS.md') diff --git a/RELEASE_PROCESS.md b/RELEASE_PROCESS.md index 8ac9bbcd..34e9a36f 100644 --- a/RELEASE_PROCESS.md +++ b/RELEASE_PROCESS.md @@ -9,7 +9,7 @@ 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)) +- `CHANGELOG.md` (by using this command `github_changelog_generator --no-compare-link --header-label="# Changelog" --no-issues --no-pr-wo-labels --since-tag="1.9.2"`. [github-changelog-generator is available here](https://github.com/skywinder/github-changelog-generator)) #### Create release on GitHub -- cgit v1.2.3