From b7d721db1f7008216fdf6183a0edaea12a1aa0fb Mon Sep 17 00:00:00 2001 From: Vijay A Date: Mon, 2 Oct 2023 21:42:39 +0530 Subject: Bump up version to the next nightly.0; Update Contributing doc to detail out more steps while releasing --- CONTRIBUTING.md | 11 +++++++++-- package.json | 2 +- recipes | 2 +- 3 files changed, 11 insertions(+), 4 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 8a6268274..ffda7acb9 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -186,8 +186,15 @@ git merge --no-ff nightly --no-verify # # # -# -git push +git push upstream release +# Note: Do NOT allow the GHA release process to create the tag automatically, since that will be at the SHA in the develop branch and not on the release branch - which is logically incorrect +git tag v$(node -p 'require("./package.json").version') +git push upstream --tags +# Note: GHA will automatically build with publish since its the release branch +# Note: Once the GHA action is completed, verify the builds (there should be 32 assets before publishing) +gco develop +# +# ``` This will automatically trigger the build, as part of which, a new, draft release will be created [here](https://github.com/ferdium/ferdium-app/releases/). Once all the assets are uploaded (19 assets in total), publish the release (you will need elevated permissions in GitHub for doing this). The last commit of the `release` branch will be tagged. diff --git a/package.json b/package.json index 731dae677..bf010d444 100644 --- a/package.json +++ b/package.json @@ -3,7 +3,7 @@ "productName": "Ferdium", "desktopName": "ferdium.desktop", "appId": "org.ferdium.ferdium-app", - "version": "6.5.0-nightly.21", + "version": "6.5.1-nightly.0", "description": "Messaging app for WhatsApp, Slack, Telegram, Hangouts and many many more.", "author": "Ferdium Contributors (https://ferdium.org/)", "license": "Apache-2.0", diff --git a/recipes b/recipes index cdafac130..36774cff6 160000 --- a/recipes +++ b/recipes @@ -1 +1 @@ -Subproject commit cdafac130fd454610d1fa2cb53b061b17b64e2ce +Subproject commit 36774cff661e1306ffd1b4ff5fce432eb107570c -- cgit v1.2.3-70-g09d2