Skip to content

Commit cba4cda

Browse files
committed
docs: fix little issues in release process
1 parent f897f2f commit cba4cda

File tree

1 file changed

+18
-2
lines changed

1 file changed

+18
-2
lines changed

docs/release_process.md

+18-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Torrust Tracker Release Process (v2.2.1)
1+
# Torrust Tracker Release Process (v2.2.2)
22

33
## Version:
44
> **The `[semantic version]` is bumped according to releases, new features, and breaking changes.**
@@ -7,6 +7,20 @@
77
88
## Process:
99

10+
**Note**: this guide assumes that the your git `torrust` remote is like this:
11+
12+
```sh
13+
git remote show torrust
14+
```
15+
16+
```s
17+
* remote torrust
18+
Fetch URL: git@github.com:torrust/torrust-tracker.git
19+
Push URL: git@github.com:torrust/torrust-tracker.git
20+
...
21+
```
22+
23+
1024
### 1. The `develop` branch is ready for a release.
1125
The `develop` branch should have the version `[semantic version]-develop` that is ready to be released.
1226

@@ -22,6 +36,7 @@ git push --force torrust develop:staging/main
2236
```sh
2337
git stash
2438
git switch staging/main
39+
git reset --hard torrust/staging/main
2540
# change `[semantic version]-develop` to `[semantic version]`.
2641
git add -A
2742
git commit -m "release: version [semantic version]"
@@ -65,7 +80,8 @@ git push --force torrust main:staging/develop
6580

6681
```sh
6782
git stash
68-
git switch staging/main
83+
git switch staging/develop
84+
git reset --hard torrust/staging/develop
6985
# change `[semantic version]` to `(next)[semantic version]-develop`.
7086
git add -A
7187
git commit -m "develop: bump to version (next)[semantic version]-develop"

0 commit comments

Comments
 (0)