Jump to 2.3.6-dev and update release process

Fix release archive in `release.sh` and also fix a typo in the release process

diff --git a/RELEASE_PROCESS.md b/RELEASE_PROCESS.md
index 8995580b9f9c8013856907437f4f97da2b823b9f..829f8390cb80c13c78d0e22aaa2188abe8ecda95 100644 (file)
--- a/RELEASE_PROCESS.md
+++ b/RELEASE_PROCESS.md
@@ -53,7 +53,7 @@ make release VERSION=$LAST_WALLABAG_RELEASE
 - 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, MD5 sum, releases and new blog post)
-- Put the next patch version suffixed with `-dev` in `app/config/config.yml` (`wallabag_core.version`)
+- Put the next patch version suffixed with `-dev` in `app/config/wallabag.yml` (`wallabag_core.version`)
 - Drink a :beer:!
 
 ### `composer.lock`

diff --git a/app/config/wallabag.yml b/app/config/wallabag.yml
index 1948175c05aa3128d4c2a964dfcfe7758c5a4f8a..d9a3d5dc7d0b086fe3e7c9c9f84008a10e4fef2c 100644 (file)
--- a/app/config/wallabag.yml
+++ b/app/config/wallabag.yml
@@ -1,5 +1,5 @@
 wallabag_core:
-    version: 2.3.5
+    version: 2.3.6-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 2356a3f0630ee88576a0a00f2b1d198c3c36472c..ee08a688ffbff85033ae1b2a0bb55ad09112da11 100755 (executable)
--- a/scripts/release.sh
+++ b/scripts/release.sh
@@ -15,6 +15,6 @@ cd $TMP_FOLDER/$RELEASE_FOLDER/$VERSION && php bin/console wallabag:install --en
 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-release-$VERSION.tar.gz
+md5 $TMP_FOLDER/$RELEASE_FOLDER/wallabag-$VERSION.tar.gz
 echo "Package to upload to the release server:"
-echo $TMP_FOLDER/$RELEASE_FOLDER/wallabag-release-$VERSION.tar.gz
+echo $TMP_FOLDER/$RELEASE_FOLDER/wallabag-$VERSION.tar.gz