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 2fe58386a07edf9e90e13931946dd776be597215..797f96a34aed99e0d50fd042f8d152ca828e866e 100644 (file)
--- 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>\r
 <li>org.simantics.sdk.repository project version bump</li>\r
 </ul>\r
 <li>org.simantics.sdk feature version bump</li>\r
 <li>org.simantics.sdk.repository project version bump</li>\r
 </ul>\r

-<p>Perform and push the changes by running:</p>\r
-<pre><code>./release-helper.sh $version $branch $user bump-master-version 1.35.0 1.36.0\r
+<p>Perform and push the changes <em>in master</em> by running:</p>\r
+<pre><code>branch=master\r
+./release-helper.sh $version $branch $user checkout\r
+./release-helper.sh $version $branch $user bump-master-version x.y.z X.Y.Z\r

 ./release-helper.sh $version $branch $user push\r
 </code></pre>\r
 ./release-helper.sh $version $branch $user push\r
 </code></pre>\r

+where <code>x.y.z</code> is the old version number of master and <code>X.Y.Z</code> is the new version number.\r

 <h3>Test Release Train build</h3>\r
 <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>\r
 <ul>\r
 <h3>Test Release Train build</h3>\r
 <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>\r
 <ul>\r

diff --git a/releng/doc/release.md b/releng/doc/release.md
index e3749dccf6a420abc84bf6279d2cb75b3a22915a..fc8fcbf81aabf2adb6f8bd0d55ba8d73f87c821d 100644 (file)
--- 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 
 
    * 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
 
     ./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
 ### 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