157 lines
9.6 KiB
HTML
157 lines
9.6 KiB
HTML
|
<!DOCTYPE html>
|
|||
|
|
<html>
|
|||
|
|
<head>
|
|||
|
|
<meta charset="utf-8">
|
|||
|
|
<meta name="generator" content="pandoc">
|
|||
|
|
<meta name="viewport" content="width=device-width, initial-scale=1.0, user-scalable=yes">
|
|||
|
|
<title>Shaarli – Versioning and Branches</title>
|
|||
|
|
<style type="text/css">code{white-space: pre;}</style>
|
|||
|
|
<style type="text/css">
|
|||
|
|
div.sourceCode { overflow-x: auto; }
|
|||
|
|
table.sourceCode, tr.sourceCode, td.lineNumbers, td.sourceCode {
|
|||
|
|
margin: 0; padding: 0; vertical-align: baseline; border: none; }
|
|||
|
|
table.sourceCode { width: 100%; line-height: 100%; }
|
|||
|
|
td.lineNumbers { text-align: right; padding-right: 4px; padding-left: 4px; color: #aaaaaa; border-right: 1px solid #aaaaaa; }
|
|||
|
|
td.sourceCode { padding-left: 5px; }
|
|||
|
|
code > span.kw { color: #007020; font-weight: bold; } /* Keyword */
|
|||
|
|
code > span.dt { color: #902000; } /* DataType */
|
|||
|
|
code > span.dv { color: #40a070; } /* DecVal */
|
|||
|
|
code > span.bn { color: #40a070; } /* BaseN */
|
|||
|
|
code > span.fl { color: #40a070; } /* Float */
|
|||
|
|
code > span.ch { color: #4070a0; } /* Char */
|
|||
|
|
code > span.st { color: #4070a0; } /* String */
|
|||
|
|
code > span.co { color: #60a0b0; font-style: italic; } /* Comment */
|
|||
|
|
code > span.ot { color: #007020; } /* Other */
|
|||
|
|
code > span.al { color: #ff0000; font-weight: bold; } /* Alert */
|
|||
|
|
code > span.fu { color: #06287e; } /* Function */
|
|||
|
|
code > span.er { color: #ff0000; font-weight: bold; } /* Error */
|
|||
|
|
code > span.wa { color: #60a0b0; font-weight: bold; font-style: italic; } /* Warning */
|
|||
|
|
code > span.cn { color: #880000; } /* Constant */
|
|||
|
|
code > span.sc { color: #4070a0; } /* SpecialChar */
|
|||
|
|
code > span.vs { color: #4070a0; } /* VerbatimString */
|
|||
|
|
code > span.ss { color: #bb6688; } /* SpecialString */
|
|||
|
|
code > span.im { } /* Import */
|
|||
|
|
code > span.va { color: #19177c; } /* Variable */
|
|||
|
|
code > span.cf { color: #007020; font-weight: bold; } /* ControlFlow */
|
|||
|
|
code > span.op { color: #666666; } /* Operator */
|
|||
|
|
code > span.bu { } /* BuiltIn */
|
|||
|
|
code > span.ex { } /* Extension */
|
|||
|
|
code > span.pp { color: #bc7a00; } /* Preprocessor */
|
|||
|
|
code > span.at { color: #7d9029; } /* Attribute */
|
|||
|
|
code > span.do { color: #ba2121; font-style: italic; } /* Documentation */
|
|||
|
|
code > span.an { color: #60a0b0; font-weight: bold; font-style: italic; } /* Annotation */
|
|||
|
|
code > span.cv { color: #60a0b0; font-weight: bold; font-style: italic; } /* CommentVar */
|
|||
|
|
code > span.in { color: #60a0b0; font-weight: bold; font-style: italic; } /* Information */
|
|||
|
|
</style>
|
|||
|
|
<link rel="stylesheet" href="github-markdown.css">
|
|||
|
|
<!--[if lt IE 9]>
|
|||
|
|
<script src="//cdnjs.cloudflare.com/ajax/libs/html5shiv/3.7.3/html5shiv-printshiv.min.js"></script>
|
|||
|
|
<![endif]-->
|
|||
|
|
</head>
|
|||
|
|
<body>
|
|||
|
|
<div id="local-sidebar">
|
|||
|
|
<ul>
|
|||
|
|
<li><a href="Home.html">Home</a></li>
|
|||
|
|
<li>Setup
|
|||
|
|
<ul>
|
|||
|
|
<li><a href="Download-and-Installation.html">Download and Installation</a></li>
|
|||
|
|
<li><a href="Upgrade-and-migration.html">Upgrade and migration</a></li>
|
|||
|
|
<li><a href="Server-requirements.html">Server requirements</a></li>
|
|||
|
|
<li><a href="Server-configuration.html">Server configuration</a></li>
|
|||
|
|
<li><a href="Server-security.html">Server security</a></li>
|
|||
|
|
<li><a href="Shaarli-configuration.html">Shaarli configuration</a></li>
|
|||
|
|
<li><a href="Plugins.html">Plugins</a></li>
|
|||
|
|
</ul></li>
|
|||
|
|
<li><a href="Docker.html">Docker</a></li>
|
|||
|
|
<li><a href="Usage.html">Usage</a>
|
|||
|
|
<ul>
|
|||
|
|
<li><a href="Sharing-button.html">Sharing button</a> (bookmarklet)</li>
|
|||
|
|
<li><a href="Browsing-and-Searching.html">Browsing and Searching</a></li>
|
|||
|
|
<li><a href="Firefox-share.html">Firefox share</a></li>
|
|||
|
|
<li><a href="RSS-feeds.html">RSS feeds</a></li>
|
|||
|
|
<li><a href="REST-API.html">REST API</a></li>
|
|||
|
|
</ul></li>
|
|||
|
|
<li>How To
|
|||
|
|
<ul>
|
|||
|
|
<li><a href="Backup,-restore,-import-and-export.html">Backup, restore, import and export</a></li>
|
|||
|
|
<li><a href="Copy-an-existing-installation-over-SSH-and-serve-it-locally.html">Copy an existing installation over SSH and serve it locally</a></li>
|
|||
|
|
<li><a href="Create-and-serve-multiple-Shaarlis-(farm).html">Create and serve multiple Shaarlis (farm)</a></li>
|
|||
|
|
<li><a href="Download-CSS-styles-from-an-OPML-list.html">Download CSS styles from an OPML list</a></li>
|
|||
|
|
<li><a href="Datastore-hacks.html">Datastore hacks</a></li>
|
|||
|
|
</ul></li>
|
|||
|
|
<li><a href="Troubleshooting.html">Troubleshooting</a></li>
|
|||
|
|
<li><a href="Development.html">Development</a>
|
|||
|
|
<ul>
|
|||
|
|
<li><a href="GnuPG-signature.html">GnuPG signature</a></li>
|
|||
|
|
<li><a href="Coding-guidelines.html">Coding guidelines</a></li>
|
|||
|
|
<li><a href="Directory-structure.html">Directory structure</a></li>
|
|||
|
|
<li><a href="3rd-party-libraries.html">3rd party libraries</a></li>
|
|||
|
|
<li><a href="Plugin-System.html">Plugin System</a></li>
|
|||
|
|
<li><a href="Release-Shaarli.html">Release Shaarli</a></li>
|
|||
|
|
<li><a href="Versioning-and-Branches.html">Versioning and Branches</a></li>
|
|||
|
|
<li><a href="Security.html">Security</a></li>
|
|||
|
|
<li><a href="Static-analysis.html">Static analysis</a></li>
|
|||
|
|
<li><a href="Theming.html">Theming</a></li>
|
|||
|
|
<li><a href="Unit-tests.html">Unit tests</a></li>
|
|||
|
|
</ul></li>
|
|||
|
|
<li>About
|
|||
|
|
<ul>
|
|||
|
|
<li><a href="FAQ.html">FAQ</a></li>
|
|||
|
|
<li><a href="Community-&-Related-software.html">Community & Related software</a></li>
|
|||
|
|
</ul></li>
|
|||
|
|
</ul>
|
|||
|
|
</div>
|
|||
|
|
<h1 id="versioning-and-branches">Versioning and Branches</h1>
|
|||
|
|
<p>[<strong>WORK IN PROGRESS</strong>][](.html)</p>
|
|||
|
|
<p>It's important to understand how Shaarli branches work, especially if you're maintaining a 3rd party tools for Shaarli (theme, plugin, etc.), to be sure stay compatible.</p>
|
|||
|
|
<h2 id="master-branch"><code>master</code> branch</h2>
|
|||
|
|
<p>The <code>master</code> branch is the development branch. Any new change MUST go through this branch using Pull Requests.</p>
|
|||
|
|
<p>Remarks:</p>
|
|||
|
|
<ul>
|
|||
|
|
<li>This branch shouldn't be used for production as it isn't necessary stable.</li>
|
|||
|
|
<li>3rd party aren't required to be compatible with the latest changes.</li>
|
|||
|
|
<li>Official plugins, themes and libraries (contained within Shaarli organization repos) must be compatible with the master branch.</li>
|
|||
|
|
<li>The version in this branch is always <code>dev</code>.</li>
|
|||
|
|
</ul>
|
|||
|
|
<h2 id="v0.x-branch"><code>v0.x</code> branch</h2>
|
|||
|
|
<p>This <code>v0.x</code> branch, points to the latest <code>v0.x.y</code> release.</p>
|
|||
|
|
<p>Explanation:</p>
|
|||
|
|
<p>When a new version is released, it might contains a major bug which isn't detected right away. For example, a new PHP version is released, containing backward compatibility issue which doesn't work with Shaarli.</p>
|
|||
|
|
<p>In this case, the issue is fixed in the <code>master</code> branch, and the fix is backported the to the <code>v0.x</code> branch. Then a new release is made from the <code>v0.x</code> branch.</p>
|
|||
|
|
<p>This workflow allow us to fix any major bug detected, without having to release bleeding edge feature too soon.</p>
|
|||
|
|
<h2 id="latest-branch"><code>latest</code> branch</h2>
|
|||
|
|
<p>This branch point the latest release. It recommended to use it to get the latest tested changes.</p>
|
|||
|
|
<h2 id="stable-branch"><code>stable</code> branch</h2>
|
|||
|
|
<p>The <code>stable</code> branch doesn't contain any major bug, and is one major digit version behind the latest release.</p>
|
|||
|
|
<p>For example, the current latest release is <code>v0.8.3</code>, the stable branch is an alias to the latest <code>v0.7.x</code> release. When the <code>v0.9.0</code> version will be released, the stable will move to the latest <code>v0.8.x</code> release.</p>
|
|||
|
|
<p>Remarks:</p>
|
|||
|
|
<ul>
|
|||
|
|
<li>Shaarli release pace isn't fast, and the stable branch might be a few months behind the latest release.</li>
|
|||
|
|
</ul>
|
|||
|
|
<h2 id="releases">Releases</h2>
|
|||
|
|
<p>Releases are always made from the latest <code>v0.x</code> branch.</p>
|
|||
|
|
<p>Note that for every release, we manually generate a tarball which contains all Shaarli dependencies, making Shaarli's installation only one step.</p>
|
|||
|
|
<h2 id="advices-on-3rd-party-git-repos-workflow">Advices on 3rd party git repos workflow</h2>
|
|||
|
|
<h3 id="versioning">Versioning</h3>
|
|||
|
|
<p>Any time a new Shaarli release is published, you should publish a new release of your repo if the changes affected you since the latest release (take a look at the <a href="https://github.com/shaarli/Shaarli/releases">changelog</a> (<em>Draft</em> means not released yet) and the commit log (like <a href="https://github.com/shaarli/Shaarli/commits/master/tpl/default"><code>tpl</code> folder</a> for themes)). You can either:<a href=".html"></a></p>
|
|||
|
|
<ul>
|
|||
|
|
<li>use the Shaarli version number, with your repo version. For example, if Shaarli <code>v0.8.3</code> is released, publish a <code>v0.8.3-1</code> release, where <code>v0.8.3</code> states Shaarli compatibility and <code>-1</code> is your own version digit for the current Shaarli version.</li>
|
|||
|
|
<li>use your own versioning scheme, and state Shaarli compatibility in the release description.</li>
|
|||
|
|
</ul>
|
|||
|
|
<p>Using this, any user will be able to pick the release matching his own Shaarli version.</p>
|
|||
|
|
<h3 id="major-bugfix-backport-releases">Major bugfix backport releases</h3>
|
|||
|
|
<p>To be able to support backported fixes, it recommended to use our workflow:</p>
|
|||
|
|
<div class="sourceCode"><pre class="sourceCode bash"><code class="sourceCode bash"><span class="co"># In master, fix the major bug</span>
|
|||
|
|
<span class="fu">git</span> commit -m <span class="st">"Katastrophe"</span>
|
|||
|
|
<span class="fu">git</span> push origin master
|
|||
|
|
<span class="co"># Get your commit hash</span>
|
|||
|
|
<span class="fu">git</span> log --format=<span class="st">"%H"</span> -n 1
|
|||
|
|
<span class="co"># Create a new branch from your latest release, let's say v0.8.2-1 (the tag name)</span>
|
|||
|
|
<span class="fu">git</span> checkout -b katastrophe v0.8.2-1
|
|||
|
|
<span class="co"># Backport the fix commit to your brand new branch</span>
|
|||
|
|
<span class="fu">git</span> cherry-pick <span class="op"><</span>fix commit hash<span class="op">></span>
|
|||
|
|
<span class="fu">git</span> push origin katastrophe
|
|||
|
|
<span class="co"># Then you just have to make a new release from the `katastrophe` branch tagged `v0.8.3-1`</span></code></pre></div>
|
|||
|
|
</body>
|
|||
|
|
</html>
|