From cba4cda83610a1c28b977904ae7e4843c38999cb Mon Sep 17 00:00:00 2001 From: Cameron Garnham Date: Mon, 18 Sep 2023 23:33:29 +0200 Subject: [PATCH] docs: fix little issues in release process --- docs/release_process.md | 20 ++++++++++++++++++-- 1 file changed, 18 insertions(+), 2 deletions(-) diff --git a/docs/release_process.md b/docs/release_process.md index d5d94569..73b0a882 100644 --- a/docs/release_process.md +++ b/docs/release_process.md @@ -1,4 +1,4 @@ -# Torrust Tracker Release Process (v2.2.1) +# Torrust Tracker Release Process (v2.2.2) ## Version: > **The `[semantic version]` is bumped according to releases, new features, and breaking changes.** @@ -7,6 +7,20 @@ ## Process: +**Note**: this guide assumes that the your git `torrust` remote is like this: + +```sh +git remote show torrust +``` + +```s +* remote torrust + Fetch URL: git@github.com:torrust/torrust-tracker.git + Push URL: git@github.com:torrust/torrust-tracker.git +... +``` + + ### 1. The `develop` branch is ready for a release. The `develop` branch should have the version `[semantic version]-develop` that is ready to be released. @@ -22,6 +36,7 @@ git push --force torrust develop:staging/main ```sh git stash git switch staging/main +git reset --hard torrust/staging/main # change `[semantic version]-develop` to `[semantic version]`. git add -A git commit -m "release: version [semantic version]" @@ -65,7 +80,8 @@ git push --force torrust main:staging/develop ```sh git stash -git switch staging/main +git switch staging/develop +git reset --hard torrust/staging/develop # change `[semantic version]` to `(next)[semantic version]-develop`. git add -A git commit -m "develop: bump to version (next)[semantic version]-develop"