From f796bd98e9bf846c9d42a16c9de33434e72520e1 Mon Sep 17 00:00:00 2001 From: Vijay A Date: Thu, 8 Jul 2021 09:14:18 +0530 Subject: Fixed documentation regarding releases --- CONTRIBUTING.md | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) (limited to 'CONTRIBUTING.md') diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index c26de8a12..dc85edaaf 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -213,15 +213,11 @@ Assets will be available in the `out` folder. ## Release -Create a new [draft release](https://github.com/getferdi/ferdi/releases/new) that targets the `release` branch, then: - ```bash -git checkout develop && git pull -r +git checkout nightly && git pull -r git checkout release -git submodule update --remote --force -git commit -am "Update submodules" -git merge --no-ff develop +git merge --no-ff nightly --no-verify git push ``` -Once the draft release assets are uploaded (13 assets), publish the release (you will need elevated permissions in GitHub for doing this). The last commit of the `release` branch will be tagged. You can then merge `release` into `master` and back into `develop` if needed +This will automatically trigger the build, as part of which, a new, draft release will be created [here](https://github.com/getferdi/ferdi/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. -- cgit v1.2.3-54-g00ecf