summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--CONTRIBUTING.md11
-rw-r--r--package.json2
m---------recipes0
3 files changed, 10 insertions, 3 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
186# <run the build script for your OS from the `scripts` folder> 186# <run the build script for your OS from the `scripts` folder>
187# <add all pertinent changes to git> 187# <add all pertinent changes to git>
188# <create commit> 188# <create commit>
189# <create tag> 189git push upstream release
190git push 190# 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
191git tag v$(node -p 'require("./package.json").version')
192git push upstream --tags
193# Note: GHA will automatically build with publish since its the release branch
194# Note: Once the GHA action is completed, verify the builds (there should be 32 assets before publishing)
195gco develop
196# <If its a public release, manually bump to next nightly.0 version in package.json>
197# <If its a public release, manually fix homebrew-ferdium PR>
191``` 198```
192 199
193This 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. 200This 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 @@
3 "productName": "Ferdium", 3 "productName": "Ferdium",
4 "desktopName": "ferdium.desktop", 4 "desktopName": "ferdium.desktop",
5 "appId": "org.ferdium.ferdium-app", 5 "appId": "org.ferdium.ferdium-app",
6 "version": "6.5.0-nightly.21", 6 "version": "6.5.1-nightly.0",
7 "description": "Messaging app for WhatsApp, Slack, Telegram, Hangouts and many many more.", 7 "description": "Messaging app for WhatsApp, Slack, Telegram, Hangouts and many many more.",
8 "author": "Ferdium Contributors <hello@ferdium.org> (https://ferdium.org/)", 8 "author": "Ferdium Contributors <hello@ferdium.org> (https://ferdium.org/)",
9 "license": "Apache-2.0", 9 "license": "Apache-2.0",
diff --git a/recipes b/recipes
Subproject cdafac130fd454610d1fa2cb53b061b17b64e2c Subproject 36774cff661e1306ffd1b4ff5fce432eb107570