Skip to content

Commit 10ec265

Browse files
committed
Add more details in the release strategy guide
Signed-off-by: Olivier Perrin <[email protected]>
1 parent 3be504a commit 10ec265

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,6 +137,14 @@ $ 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 commits bumping to your release version then your next snapshot version.
141149
You can then push this branch.
142150
```shell
@@ -146,11 +154,13 @@ $ git commit -s -a -S -m "Bump to vX.Y.0"
146154
$ mvn versions:set -DnewVersion=X.Y+1.0-SNAPSHOT
147155
$ git commit -s -a -S -m "Bump to vX.Y+1.0-SNAPSHOT"
148156
$ git push -u origin tmp_prepare_release
157+
$ # Then create a PR for tmp_prepare_release
149158
```
150159

151160
Create a pull request from your temporary branch into the `main` branch and tag another maintainer as a reviewer so they can approve it.
152161
Once it is approved, locally merge it by following these steps:
153162
```shell
163+
$ # The PR should be reviewed and approved
154164
$ git checkout main
155165
$ git pull
156166
$ git merge --ff tmp_prepare_release
@@ -173,6 +183,8 @@ Please make sure that your release note is comprehensive to all new features and
173183

174184
On your repository, checkout to the release tag. You can then package and deploy your release:
175185
```shell
186+
$ git status
187+
$ # Your local repository should be clean
176188
$ git checkout tags/vX.Y.0
177189
$ mvn dependency:purge-local-repository
178190
$ mvn clean package -Prelease

0 commit comments

Comments
 (0)