<html dir="ltr"><head>
<meta http-equiv="Content-Type" content="text/html; charset=Windows-1252">
<meta name="GENERATOR" content="MSHTML 8.00.7601.18210">
<style id="owaTempEditStyle"></style><style title="owaParaStyle"><!--P {
MARGIN-TOP: 0px; MARGIN-BOTTOM: 0px
}
--></style>
</head>
<body bgcolor="#ffffff" ocsi="x">
<div style="FONT-FAMILY: Tahoma; DIRECTION: ltr; COLOR: #000000; FONT-SIZE: x-small">
<div>I asked him to commit to 'develop'.</div>
<div><font face="tahoma"></font> </div>
<div><font face="tahoma">I also wondered about where the unstable build should come from. It's not master, as that would be stable, so it must be develop...?</font></div>
<div dir="ltr"><font color="#000000" size="2" face="Tahoma"></font> </div>
<div style="DIRECTION: ltr" id="divRpF648182">
<hr tabindex="-1">
<font color="#000000" size="2" face="Tahoma"><b>From:</b> xerte-dev-bounces@lists.nottingham.ac.uk [xerte-dev-bounces@lists.nottingham.ac.uk] On Behalf Of Tom Reijnders [reijnders@tor.nl]<br>
<b>Sent:</b> 06 September 2013 14:14<br>
<b>To:</b> For Xerte technical developers<br>
<b>Subject:</b> [Xerte-dev] Re: GitHub and Workflows<br>
</font><br>
</div>
<div></div>
<div>Hi,<br>
<br>
I am in the process of modifying the build scripts to use github in stead of svn.<br>
<br>
And I noticed that Nicodem committed to master yesterday, so I've got a question given the workflow mentioned below:<br>
<br>
1. Will we do hotfixes on released branches, i.e. on master and 2.0?<br>
2. What shall we put up on the community website? What is the equivalent to the svn trunk. master or develop, i.e. what is the basis for 'unstable'?<br>
<br>
Regards,<br>
<br>
Tom<br>
<br>
<div class="moz-cite-prefix">Op 5-9-2013 15:39, Julian Tenney schreef:<br>
</div>
<blockquote type="cite"><style>@font-face {
font-family: Wingdings;
}
@font-face {
font-family: SimSun;
}
@font-face {
font-family: SimSun;
}
@font-face {
font-family: Calibri;
}
@font-face {
font-family: @SimSun;
}
@page WordSection1 {margin: 72.0pt 72.0pt 72.0pt 72.0pt; }
P.MsoNormal {
MARGIN: 0cm 0cm 0pt; FONT-FAMILY: "Calibri","sans-serif"; FONT-SIZE: 11pt
}
LI.MsoNormal {
MARGIN: 0cm 0cm 0pt; FONT-FAMILY: "Calibri","sans-serif"; FONT-SIZE: 11pt
}
DIV.MsoNormal {
MARGIN: 0cm 0cm 0pt; FONT-FAMILY: "Calibri","sans-serif"; FONT-SIZE: 11pt
}
A:link {
COLOR: blue; TEXT-DECORATION: underline
}
SPAN.MsoHyperlink {
COLOR: blue; TEXT-DECORATION: underline
}
A:visited {
COLOR: purple; TEXT-DECORATION: underline
}
SPAN.MsoHyperlinkFollowed {
COLOR: purple; TEXT-DECORATION: underline
}
P.MsoListParagraph {
MARGIN: 0cm 0cm 0pt 36pt; FONT-FAMILY: "Calibri","sans-serif"; FONT-SIZE: 11pt
}
LI.MsoListParagraph {
MARGIN: 0cm 0cm 0pt 36pt; FONT-FAMILY: "Calibri","sans-serif"; FONT-SIZE: 11pt
}
DIV.MsoListParagraph {
MARGIN: 0cm 0cm 0pt 36pt; FONT-FAMILY: "Calibri","sans-serif"; FONT-SIZE: 11pt
}
SPAN.EmailStyle17 {
FONT-FAMILY: "Calibri","sans-serif"; COLOR: windowtext
}
.MsoChpDefault {
FONT-FAMILY: "Calibri","sans-serif"
}
DIV.WordSection1 {
}
OL {
MARGIN-BOTTOM: 0cm
}
UL {
MARGIN-BOTTOM: 0cm
}
</style>
<div class="WordSection1">
<p class="MsoNormal">Hi,</p>
<p class="MsoNormal"> </p>
<p class="MsoNormal">I think we’ve got the SVN migrated over to Git Hub with all the history, branches etc, which is great. We need to have some discussion about workflow, and I want to suggest gitflow as a good workflow to adopt. Information can be found here
<a href="http://nvie.com/posts/a-successful-git-branching-model/" target="_blank">
http://nvie.com/posts/a-successful-git-branching-model/</a> and elsewhere (here: <a href="https://www.atlassian.com/git/workflows" target="_blank">
https://www.atlassian.com/git/workflows</a> for example).</p>
<p class="MsoNormal"> </p>
<p class="MsoNormal">I like it for several reasons:</p>
<p class="MsoNormal"> </p>
<p style="TEXT-INDENT: -18pt" class="MsoListParagraph"><span>-<span> </span>
</span><span dir="ltr"></span>The ‘master’ branch is always production quality released code</p>
<p style="TEXT-INDENT: -18pt" class="MsoListParagraph"><span>-<span> </span>
</span><span dir="ltr"></span>Small developments (trivial) can be undertaken directly in ‘develop’</p>
<p style="TEXT-INDENT: -18pt" class="MsoListParagraph"><span>-<span> </span>
</span><span dir="ltr"></span>Larger developments can be undertaken in braches taken from ‘develop’, and then merged back into develop once complete…</p>
<p style="TEXT-INDENT: -18pt" class="MsoListParagraph"><span>-<span> </span>
</span><span dir="ltr"></span>…testing of develop can then be undertaken before we make a new release number.</p>
<p class="MsoNormal"> </p>
<p class="MsoNormal">See the information for more details. Does this seem sensible and agreeable to everyone?</p>
<p class="MsoNormal"> </p>
<p class="MsoNormal">There are two other things I’d like us to work towards, again subject to some discussion between us:</p>
<p class="MsoNormal"> </p>
<p class="MsoNormal">Using Tickets for Issues and New Features:</p>
<p style="TEXT-INDENT: -18pt" class="MsoListParagraph"><span>-<span> </span>
</span><span dir="ltr"></span>Using some ticketing system to record bugs to be fixed, new features to be developed, because we keep losing these;</p>
<p style="TEXT-INDENT: -18pt" class="MsoListParagraph"><span>-<span> </span>
</span><span dir="ltr"></span>Using those tickets as a way of grouping work into sprints towards a new release;</p>
<p style="TEXT-INDENT: -18pt" class="MsoListParagraph"><span>-<span> </span>
</span><span dir="ltr"></span>Could be trac, could be github, open to suggestions;</p>
<p class="MsoNormal"> </p>
<p class="MsoNormal">A better means of testing the software rather than the hit and hope method we currently employ:</p>
<p style="TEXT-INDENT: -18pt" class="MsoListParagraph"><span>-<span> </span>
</span><span dir="ltr"></span>Open to suggestions here?</p>
<p style="TEXT-INDENT: -18pt" class="MsoListParagraph"><span>-<span> </span>
</span><span dir="ltr"></span>Probably starts with a list of manual tests to work through?</p>
<p style="TEXT-INDENT: -18pt" class="MsoListParagraph"><span>-<span> </span>
</span><span dir="ltr"></span>Possibly includes automation (Selenium?)</p>
<p style="TEXT-INDENT: -18pt" class="MsoListParagraph"><span>-<span> </span>
</span><span dir="ltr"></span>UnitTesting probably a very long term goal, might not even be possible?</p>
<p class="MsoNormal"> </p>
<p class="MsoNormal">So my vision would be that we log tickets, we use that list of tickets as a big to-do list; we create a smaller current to-do list from it for the next release; we do the development a la gitflow; changes get pushed to develop and tested;
new version released. It sounds good in theory at any rate, it will require a bit more discipline amongst us, but I think the benefits are worth it. I’d very much appreciate your views…</p>
<p class="MsoNormal"> </p>
<p class="MsoNormal">Thanks,</p>
<p class="MsoNormal"> </p>
<p class="MsoNormal">Julian</p>
<p class="MsoNormal"> </p>
<p class="MsoNormal"> </p>
<p class="MsoNormal"> </p>
</div>
<br>
<p>This message and any attachment are intended solely for the addressee and may contain confidential information. If you have received this message in error, please send it back to me, and immediately delete it. Please do not use, copy or disclose the information
contained in this message or in any attachment. Any views or opinions expressed by the author of this email do not necessarily reflect the views of the University of Nottingham.</p>
<p>This message has been checked for viruses but the contents of an attachment may still contain software viruses which could damage your computer system, you are advised to perform your own checks. Email communications with the University of Nottingham may
be monitored as permitted by UK legislation.</p>
<br>
<br>
<fieldset class="mimeAttachmentHeader"></fieldset> <br>
<pre>_______________________________________________
Xerte-dev mailing list
<a class="moz-txt-link-abbreviated" href="mailto:Xerte-dev@lists.nottingham.ac.uk">Xerte-dev@lists.nottingham.ac.uk</a>
<a class="moz-txt-link-freetext" href="http://lists.nottingham.ac.uk/mailman/listinfo/xerte-dev" target="_blank">http://lists.nottingham.ac.uk/mailman/listinfo/xerte-dev</a>
</pre>
</blockquote>
<br>
<pre class="moz-signature" cols="72">--
--
Tom Reijnders
TOR Informatica
Chopinlaan 27
5242HM Rosmalen
Tel: 073 5226191
Fax: 073 5226196
</pre>
</div>
</div>
</body>
</html>