diff options
| author | Jérémy Benoist <j0k3r@users.noreply.github.com> | 2018-12-17 09:34:15 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-12-17 09:34:15 +0100 |
| commit | 4d0c632c70ea50d459c3c55ddda2e0f394dd51cb (patch) | |
| tree | 54b719dea9c9b8d301bf214a50291cac5e03278d | |
| parent | 45e26a7fc82c81e768a6f0f3c5955cfc6d42ebc5 (diff) | |
| parent | 4fd5f670fe555da54c7a488b2a038a6ee36ee935 (diff) | |
| download | wallabag-4d0c632c70ea50d459c3c55ddda2e0f394dd51cb.tar.gz wallabag-4d0c632c70ea50d459c3c55ddda2e0f394dd51cb.tar.zst wallabag-4d0c632c70ea50d459c3c55ddda2e0f394dd51cb.zip | |
Merge pull request #3814 from wallabag/2.3.6-dev
Jump to 2.3.6-dev and update release process
| -rw-r--r-- | RELEASE_PROCESS.md | 2 | ||||
| -rw-r--r-- | app/config/wallabag.yml | 2 | ||||
| -rwxr-xr-x | scripts/release.sh | 4 |
3 files changed, 4 insertions, 4 deletions
diff --git a/RELEASE_PROCESS.md b/RELEASE_PROCESS.md index 8995580b..829f8390 100644 --- a/RELEASE_PROCESS.md +++ b/RELEASE_PROCESS.md | |||
| @@ -53,7 +53,7 @@ make release VERSION=$LAST_WALLABAG_RELEASE | |||
| 53 | - Update the URL shortener (used on `wllbg.org` to generate links like `https://wllbg.org/latest-v2-package` or `http://wllbg.org/latest-v2`) | 53 | - Update the URL shortener (used on `wllbg.org` to generate links like `https://wllbg.org/latest-v2-package` or `http://wllbg.org/latest-v2`) |
| 54 | - Update Dockerfile https://github.com/wallabag/docker (and create a new tag) | 54 | - Update Dockerfile https://github.com/wallabag/docker (and create a new tag) |
| 55 | - Update wallabag.org website (downloads, MD5 sum, releases and new blog post) | 55 | - Update wallabag.org website (downloads, MD5 sum, releases and new blog post) |
| 56 | - Put the next patch version suffixed with `-dev` in `app/config/config.yml` (`wallabag_core.version`) | 56 | - Put the next patch version suffixed with `-dev` in `app/config/wallabag.yml` (`wallabag_core.version`) |
| 57 | - Drink a :beer:! | 57 | - Drink a :beer:! |
| 58 | 58 | ||
| 59 | ### `composer.lock` | 59 | ### `composer.lock` |
diff --git a/app/config/wallabag.yml b/app/config/wallabag.yml index 1948175c..d9a3d5dc 100644 --- a/app/config/wallabag.yml +++ b/app/config/wallabag.yml | |||
| @@ -1,5 +1,5 @@ | |||
| 1 | wallabag_core: | 1 | wallabag_core: |
| 2 | version: 2.3.5 | 2 | version: 2.3.6-dev |
| 3 | paypal_url: "https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=9UBA65LG3FX9Y&lc=gb" | 3 | paypal_url: "https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=9UBA65LG3FX9Y&lc=gb" |
| 4 | languages: | 4 | languages: |
| 5 | en: 'English' | 5 | en: 'English' |
diff --git a/scripts/release.sh b/scripts/release.sh index 2356a3f0..ee08a688 100755 --- a/scripts/release.sh +++ b/scripts/release.sh | |||
| @@ -15,6 +15,6 @@ cd $TMP_FOLDER/$RELEASE_FOLDER/$VERSION && php bin/console wallabag:install --en | |||
| 15 | cd $TMP_FOLDER/$RELEASE_FOLDER/$VERSION && php bin/console assets:install --env=$ENV --symlink --relative | 15 | cd $TMP_FOLDER/$RELEASE_FOLDER/$VERSION && php bin/console assets:install --env=$ENV --symlink --relative |
| 16 | cd $TMP_FOLDER/$RELEASE_FOLDER && tar czf wallabag-$VERSION.tar.gz --exclude="var/cache/*" --exclude="var/logs/*" --exclude="var/sessions/*" --exclude=".git" $VERSION | 16 | cd $TMP_FOLDER/$RELEASE_FOLDER && tar czf wallabag-$VERSION.tar.gz --exclude="var/cache/*" --exclude="var/logs/*" --exclude="var/sessions/*" --exclude=".git" $VERSION |
| 17 | echo "MD5 checksum of the package for wallabag $VERSION" | 17 | echo "MD5 checksum of the package for wallabag $VERSION" |
| 18 | md5 $TMP_FOLDER/$RELEASE_FOLDER/wallabag-release-$VERSION.tar.gz | 18 | md5 $TMP_FOLDER/$RELEASE_FOLDER/wallabag-$VERSION.tar.gz |
| 19 | echo "Package to upload to the release server:" | 19 | echo "Package to upload to the release server:" |
| 20 | echo $TMP_FOLDER/$RELEASE_FOLDER/wallabag-release-$VERSION.tar.gz | 20 | echo $TMP_FOLDER/$RELEASE_FOLDER/wallabag-$VERSION.tar.gz |