Skip to content

Commit 40f7403

Browse files
committed
Add more details in the release strategy guide
Signed-off-by: Olivier Perrin <[email protected]>
1 parent f116edc commit 40f7403

File tree

1 file changed

+12
-0
lines changed

1 file changed

+12
-0
lines changed

BRANCHING_RELEASE_STRATEGY.md

+12
Original file line numberDiff line numberDiff line change
@@ -137,12 +137,21 @@ $ git checkout main
137137
$ git pull
138138
```
139139

140+
Verify that you don't use a RC or SNAPSHOT version for the PowSyBl dependencies.
141+
Using the following command, you should only have your repo version:
142+
```shell
143+
$ git grep -B2 -E "SNAPSHOT|-RC" pom.xml | less
144+
$ # You should not have RC or SNAPSHOT versions (except your own repo's one)
145+
```
146+
If it is not the case, then the bump of the dependencies should be done prior to releasing.
147+
140148
Create your temporary branch preparing to the release X.Y.0 and add a commit bumping to your release version.
141149
```shell
142150
$ git checkout -b tmp_prepare_release
143151
$ mvn versions:set -DnewVersion=X.Y.0
144152
$ git commit -s -a -S -m "Bump to vX.Y.0"
145153
$ git push -u origin tmp_prepare_release
154+
$ # Then create a PR for tmp_prepare_release
146155
```
147156

148157
Create a pull request from your temporary branch into the `main` branch.
@@ -159,6 +168,7 @@ Tag another maintainer as a reviewer to your pull request so they can approve it
159168

160169
Once it is approved, locally merge it by following these steps:
161170
```shell
171+
$ # The PR should be reviewed and approved
162172
$ git checkout main
163173
$ git pull
164174
$ git merge --ff tmp_prepare_release
@@ -181,6 +191,8 @@ Please make sure that your release note is comprehensive to all new features and
181191

182192
On your repository, checkout to the release tag. You can then package and deploy your release:
183193
```shell
194+
$ git status
195+
$ # Your local repository should be clean
184196
$ git checkout tags/vX.Y.0
185197
$ mvn dependency:purge-local-repository
186198
$ mvn clean package -Prelease

0 commit comments

Comments
 (0)