gluon-cli
Version:
Gluon cli: the gitflow and CI tool
390 lines (277 loc) • 9.31 kB
HTML
<html>
<head>
<meta charset="utf-8">
<title>Versions between branches</title>
<link rel="stylesheet" type="text/css" href="../../css/main.css">
<script src="https://code.jquery.com/jquery-3.1.1.slim.min.js" integrity="sha256-/SIrNqv8h6QGKDuNoLGA4iret+kyesCkHGzVUUV0shc=" crossorigin="anonymous"></script>
</head>
<body>
<section class="docs">
<aside>
<div class="logoContainer">
<a href="../../index.html">
<img src="../../images/logo.svg" class="logo" />
Gluon
</a>
</div>
<ul class="main_menu">
<li>
<h4>General</h4>
<a href="../../users/get_started.html">How to install</a>
<a href="../../users/get_started010whatis.html">What is gluon?</a>
</li>
<li>
<h4>Tutorials</h4>
<ul>
<li>
<a href="../../users/tutorials/000init.html">Start working with Gluon!</a>
</li>
<li>
<a href="../../users/tutorials/010feature.html">Working with Features</a>
</li>
<li>
<a href="../../users/tutorials/020release.html">The Release process</a>
</li>
<li>
<a href="../../users/tutorials/030hotfix.html">Make a Hotfix</a>
</li>
<li>
<a href="../../users/tutorials/040merger.html">Merging master to develop</a>
</li>
<li>
<a href="../../users/tutorials/050conflicts.html">Resolving conflicts with git</a>
</li>
<li>
<a href="../../users/tutorials/060consolidate.html">Consolidate dependencies of master</a>
</li>
</ul>
</li>
<li>
<h4>Guides</h4>
<ul>
<li>
<a href="../../users/guides/001versioning.html" class="selected">Versions between branches</a>
</li>
<li>
<a href="../../users/guides/002readlogoutput.html">Reading log execution of Gluon</a>
</li>
<li>
<a href="../../users/guides/003componentlifecycle.html">Component lifecycle using Gluon</a>
</li>
</ul>
</li>
<li>
<h4>API</h4>
<h5>FLOWS</h5>
<ul>
</ul>
<h5>STEPS</h5>
<ul>
</ul>
</li>
</ul>
</aside>
<article>
<h1 id="versions-between-branches">Versions between branches</h1>
<p>These are the stable version for source code, tags and artifacts on each branch</p>
<table>
<thead>
<tr>
<th>Branch</th>
<th>Version Type</th>
<th>Option</th>
</tr>
</thead>
<tbody>
<tr>
<td>master</td>
<td>x.y.z</td>
<td>x.y.z-n</td>
</tr>
<tr>
<td>hotfix</td>
<td>x.y.z-hotfix.n</td>
<td>-</td>
</tr>
<tr>
<td>release</td>
<td>x.y.z-rc.n</td>
<td>-</td>
</tr>
<tr>
<td>develop</td>
<td>x.y.z-beta.n</td>
<td>-</td>
</tr>
<tr>
<td>feature</td>
<td>x.y.z-alpha.n</td>
<td>-</td>
</tr>
<tr>
<td>merge</td>
<td>x.y.z-aam.n</td>
<td>-</td>
</tr>
</tbody>
</table>
<p>Nightly build versions has append the timestamp when the version was created:</p>
<pre><code>x.y.z-beta.n.20170213105634
</code></pre><h2 id="how-version-change-with-all-the-gluon-processes-">How version change with all the <strong>Gluon</strong> processes:</h2>
<h3 id="feature-processes">Feature processes</h3>
<table>
<thead>
<tr>
<th>Action</th>
<th>Init Branch</th>
<th>Init Version</th>
<th>pre tag version</th>
<th>End Branch</th>
<th>End Version</th>
</tr>
</thead>
<tbody>
<tr>
<td>start feature</td>
<td>develop</td>
<td>x.y.z-beta.n</td>
<td>pre_x.y.z-alpha.n</td>
<td>feature</td>
<td>x.y.z-alpha.n</td>
</tr>
<tr>
<td>finish feature</td>
<td>feature</td>
<td>x.y.z-alpha.m</td>
<td>x.y.z-beta.n</td>
<td>develop</td>
<td>x.y.z-beta.(n+1)</td>
</tr>
</tbody>
</table>
<p>Is possible to start multiple features at the same time. All the features branches has to have different <strong>n*+ numbers. </strong>Gluon** will create several pre_ versions in order to persist the last version that was created.</p>
<p>Lets play with this...</p>
<ul>
<li>1) Suppose that we start a feature from develop, pre tag -> <strong>1.0.0-beta.0</strong> at <strong>t1</strong> with version <strong>1.0.0-alpha.0</strong>. tag -> <strong>pre_1.0.0-alpha.0</strong></li>
<li>2) At <strong>t2</strong> (t2 > t1) we start a feature with version <strong>1.0.0-alpha.1</strong>. this version is taken from adding one to pre_ tag version <strong>pre_1.0.0-alpha.(0+1)</strong></li>
<li>3) Now we want to finish <strong>1.0.0-alpha.1</strong> feature. Develop result in <strong>1.0.0-beta.1</strong>. Is the result of adding one to pre tag <strong>1.0.0-beta.(0+1)</strong>. Make new tag <strong>1.0.0-beta.1</strong></li>
<li>4) we finish <strong>1.0.0-alpha.0</strong> feature so develop result on <strong>1.0.0-beta.2</strong>. Is the result of adding one to pre tag <strong>1.0.0-beta.(1+1)</strong>. Make new tag <strong>1.0.0-beta.2</strong></li>
</ul>
<h3 id="hotfix-processes">Hotfix processes</h3>
<table>
<thead>
<tr>
<th>Action</th>
<th>Init Branch</th>
<th>Init Version</th>
<th>pre tag version</th>
<th>End Branch</th>
<th>End Version</th>
</tr>
</thead>
<tbody>
<tr>
<td>start hotfix</td>
<td>master</td>
<td>x.y.z</td>
<td>pre_x.y.z-hotfix.n</td>
<td>hotfix</td>
<td>x.y.z-hotfix.n</td>
</tr>
<tr>
<td>finish hotfix</td>
<td>hotfix</td>
<td>x.y.z-hotfix.m</td>
<td>x.y.z(-n)</td>
<td>master</td>
<td>x.y.z-(n+1)</td>
</tr>
</tbody>
</table>
<h3 id="release-processes">Release processes</h3>
<table>
<thead>
<tr>
<th>Action</th>
<th>Init Branch</th>
<th>Init Version</th>
<th>pre tag version</th>
<th>End Branch</th>
<th>End Version</th>
</tr>
</thead>
<tbody>
<tr>
<td>start release (action 1)</td>
<td>develop</td>
<td>x.y.z-beta.n</td>
<td>x.y.z-beta.n</td>
<td>develop</td>
<td>(x+1).(y+1).(z+1)-beta.n</td>
</tr>
<tr>
<td>start release (action 2)</td>
<td>develop</td>
<td>x.y.z-beta.n</td>
<td>pre_x.y.z-rc.n</td>
<td>release</td>
<td>x.y.z-rc.n</td>
</tr>
<tr>
<td>finish release</td>
<td>release</td>
<td>x.y.z-rc.n</td>
<td>auto</td>
<td>master</td>
<td>x.y.z</td>
</tr>
</tbody>
</table>
<p><strong>Action 1:</strong> Will ask the type of the next release (major/minor/patch)</p>
<p><strong>Only one release at once!</strong></p>
<h3 id="merge-processes">Merge processes</h3>
<p>Its pretty similar to feature process.</p>
<table>
<thead>
<tr>
<th>Action</th>
<th>Init Branch</th>
<th>Init Version</th>
<th>pre tag version</th>
<th>End Branch</th>
<th>End Version</th>
</tr>
</thead>
<tbody>
<tr>
<td>start merger</td>
<td>develop</td>
<td>x.y.z-beta.n</td>
<td>pre_x.y.z-aam.n</td>
<td>merger</td>
<td>x.y.z-aam.n</td>
</tr>
<tr>
<td>finish merger</td>
<td>merger</td>
<td>x.y.z-aam.m</td>
<td>x.y.z-beta.n</td>
<td>develop</td>
<td>x.y.z-beta.(n+1)</td>
</tr>
</tbody>
</table>
</article>
</section>
<script type="text/javascript" src="../../js/highlight.pack.js"></script>
<script>
hljs.initHighlightingOnLoad();
$(function(){
$('.toggle_section').on('click', function(ev) {
$(ev.currentTarget).parent('li').toggleClass('open');
});
});
</script>
</body>
</html>