From a03c4d90b2c3a84ecb994417e2877a7d847b462c Mon Sep 17 00:00:00 2001 From: Jeremy Benoist Date: Sun, 25 Nov 2018 09:43:21 +0100 Subject: [PATCH] Jump to 2.3.5-dev and update release process MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit After the latest release, I update the documentation about it so it’s more clear --- RELEASE_PROCESS.md | 15 +++++++-------- app/config/wallabag.yml | 2 +- scripts/release.sh | 8 ++++---- 3 files changed, 12 insertions(+), 13 deletions(-) diff --git a/RELEASE_PROCESS.md b/RELEASE_PROCESS.md index 38dd5a7c..7e43d9d6 100644 --- a/RELEASE_PROCESS.md +++ b/RELEASE_PROCESS.md @@ -4,7 +4,7 @@ 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 @@ -26,8 +26,8 @@ SYMFONY_ENV=prod composer up --no-dev ```diff script: -- - travis_wait bash composer install -o --no-interaction --no-progress --prefer-dist -+ - travis_wait composer update --no-interaction --no-progress +- - 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: @@ -42,15 +42,14 @@ git push origin release-$LAST_WALLABAG_RELEASE - Run these command to create the package: ``` -make release master /tmp wllbg-release prod +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**). +- [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 [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) +- 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:! diff --git a/app/config/wallabag.yml b/app/config/wallabag.yml index 6354b22f..847a8058 100644 --- a/app/config/wallabag.yml +++ b/app/config/wallabag.yml @@ -1,5 +1,5 @@ wallabag_core: - version: 2.3.4 + version: 2.3.5-dev paypal_url: "https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=9UBA65LG3FX9Y&lc=gb" languages: en: 'English' diff --git a/scripts/release.sh b/scripts/release.sh index 6186a486..2356a3f0 100755 --- a/scripts/release.sh +++ b/scripts/release.sh @@ -9,12 +9,12 @@ ENV=$4 rm -rf $TMP_FOLDER/$RELEASE_FOLDER mkdir $TMP_FOLDER/$RELEASE_FOLDER -git clone git@github.com:wallabag/wallabag.git -b $VERSION $TMP_FOLDER/$RELEASE_FOLDER/$VERSION +git clone git@github.com:wallabag/wallabag.git -b release-$VERSION $TMP_FOLDER/$RELEASE_FOLDER/$VERSION cd $TMP_FOLDER/$RELEASE_FOLDER/$VERSION && SYMFONY_ENV=$ENV COMPOSER_MEMORY_LIMIT=-1 composer up -n --no-dev -cd $TMP_FOLDER/$RELEASE_FOLDER/$VERSION && php bin/console wallabag:install --env=$ENV +cd $TMP_FOLDER/$RELEASE_FOLDER/$VERSION && php bin/console wallabag:install --env=$ENV -n cd $TMP_FOLDER/$RELEASE_FOLDER/$VERSION && php bin/console assets:install --env=$ENV --symlink --relative cd $TMP_FOLDER/$RELEASE_FOLDER && tar czf wallabag-$VERSION.tar.gz --exclude="var/cache/*" --exclude="var/logs/*" --exclude="var/sessions/*" --exclude=".git" $VERSION echo "MD5 checksum of the package for wallabag $VERSION" -md5 $TMP_FOLDER/$RELEASE_FOLDER/wallabag-$VERSION.tar.gz +md5 $TMP_FOLDER/$RELEASE_FOLDER/wallabag-release-$VERSION.tar.gz echo "Package to upload to the release server:" -echo $TMP_FOLDER/$RELEASE_FOLDER/wallabag-$VERSION.tar.gz +echo $TMP_FOLDER/$RELEASE_FOLDER/wallabag-release-$VERSION.tar.gz -- 2.41.0