From: Tuukka Lehtonen <tuukka.lehtonen@semantum.fi>
Date: Fri, 16 Nov 2018 06:24:01 +0000 (+0200)
Subject: More precise instructions for bumping master revision
X-Git-Tag: v1.43.0~136^2~266
X-Git-Url: https://gerrit.simantics.org/r/gitweb?p=simantics%2Fplatform.git;a=commitdiff_plain;h=d6223fdc91d3355c12a952e5186dcc4e56407618

More precise instructions for bumping master revision

Just to avoid similar future mistakes.

gitlab #201
---

diff --git a/releng/doc/release.html b/releng/doc/release.html
index 2fe58386a..797f96a34 100644
--- a/releng/doc/release.html
+++ b/releng/doc/release.html
@@ -449,10 +449,13 @@ The changes include:</p>
 <li>org.simantics.sdk feature version bump</li>
 <li>org.simantics.sdk.repository project version bump</li>
 </ul>
-<p>Perform and push the changes by running:</p>
-<pre><code>./release-helper.sh $version $branch $user bump-master-version 1.35.0 1.36.0
+<p>Perform and push the changes <em>in master</em> by running:</p>
+<pre><code>branch=master
+./release-helper.sh $version $branch $user checkout
+./release-helper.sh $version $branch $user bump-master-version x.y.z X.Y.Z
 ./release-helper.sh $version $branch $user push
 </code></pre>
+where <code>x.y.z</code> is the old version number of master and <code>X.Y.Z</code> is the new version number.
 <h3>Test Release Train build</h3>
 <p>Trigger an execution of the <a href="https://www.simantics.org/jenkins/job/simantics-release-train/">simantics-release-train</a> Jenkins job with parameters</p>
 <ul>
diff --git a/releng/doc/release.md b/releng/doc/release.md
index e3749dccf..fc8fcbf81 100644
--- a/releng/doc/release.md
+++ b/releng/doc/release.md
@@ -161,11 +161,15 @@ The changes include:
    * org.simantics.sdk feature version bump
    * org.simantics.sdk.repository project version bump 
 
-Perform and push the changes by running:
+Perform and push the changes *in master* by running:
 
-    ./release-helper.sh $version $branch $user bump-master-version 1.35.0 1.36.0
+    branch=master
+    ./release-helper.sh $version $branch $user checkout
+    ./release-helper.sh $version $branch $user bump-master-version x.y.z X.Y.Z
     ./release-helper.sh $version $branch $user push
 
+where `x.y.z` is the old version number of master and `X.Y.Z` is the new version number.
+
 ### Test Release Train build
 
 Trigger an execution of the [simantics-release-train](https://www.simantics.org/jenkins/job/simantics-release-train/) Jenkins job with parameters