diff options
Diffstat (limited to 'CONTRIBUTING.md')
-rw-r--r-- | CONTRIBUTING.md | 10 |
1 files changed, 3 insertions, 7 deletions
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. | |||
213 | 213 | ||
214 | ## Release | 214 | ## Release |
215 | 215 | ||
216 | Create a new [draft release](https://github.com/getferdi/ferdi/releases/new) that targets the `release` branch, then: | ||
217 | |||
218 | ```bash | 216 | ```bash |
219 | git checkout develop && git pull -r | 217 | git checkout nightly && git pull -r |
220 | git checkout release | 218 | git checkout release |
221 | git submodule update --remote --force | 219 | git merge --no-ff nightly --no-verify |
222 | git commit -am "Update submodules" | ||
223 | git merge --no-ff develop | ||
224 | git push | 220 | git push |
225 | ``` | 221 | ``` |
226 | 222 | ||
227 | 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 | 223 | 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. |