Changes between Version 54 and Version 55 of SysAdmin/ReleaseProcess

Timestamp:

03/12/16 11:25:52 (9 years ago)

Author:

Fran Boon

Comment:

--

SysAdmin/ReleaseProcess

@@ -37 +37 @@
 * https://git-scm.com/book/en/v2/Git-Basics-Tagging
 
-=== Branch Tags ===
-If a Branch of the code is made on GitHub to manage releasesfor a deployment, then it's version will be appended to that of the Stable branch, so
+=== Deployment Branches ===
+If a Branch of the code is made to manage releases for a deployment, then there are 2 options:
+* If any significant development is done then it should be based initially off trunk
+* If no development is planned (just backporting any critical bugfixes) then it can be based off stable right away
+
+Once a Development branch moves into Production then it should move to being based off Stable (or could even start using vanilla stable releases).
+
+Branches based off Stable should have it's version appended to that of the Stable branch, so:
 {{{
 [BranchName]-[Major].[Minor].[Sub]-[BranchRelease].[Sub]
 }}}
 
+Branches based off Trunk should have it's version appended to the Major Version of the Trunk branch, so:
+{{{
+[BranchName]-[Major]-[BranchRelease].[Sub]
+}}}
+
+If a production site has another Development phase then a new Development branch should be created for that, again starting from Trunk. This can be deployed to the Dev server.
+When ready to move that branch to production then it should be rebased off stable & then Test updated from there.
 == Upgrade Scripts ==
 For every update that requires it, an Upgrade script will be added to: