You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@isis.apache.org by bu...@apache.org on 2012/12/16 13:00:06 UTC
svn commit: r842649 - in /websites/staging/isis/trunk: cgi-bin/ content/
content/contributors/release-process.html
Author: buildbot
Date: Sun Dec 16 12:00:06 2012
New Revision: 842649
Log:
Staging update by buildbot for isis
Modified:
websites/staging/isis/trunk/cgi-bin/ (props changed)
websites/staging/isis/trunk/content/ (props changed)
websites/staging/isis/trunk/content/contributors/release-process.html
Propchange: websites/staging/isis/trunk/cgi-bin/
------------------------------------------------------------------------------
--- cms:source-revision (original)
+++ cms:source-revision Sun Dec 16 12:00:06 2012
@@ -1 +1 @@
-1422523
+1422558
Propchange: websites/staging/isis/trunk/content/
------------------------------------------------------------------------------
--- cms:source-revision (original)
+++ cms:source-revision Sun Dec 16 12:00:06 2012
@@ -1 +1 @@
-1422523
+1422558
Modified: websites/staging/isis/trunk/content/contributors/release-process.html
==============================================================================
--- websites/staging/isis/trunk/content/contributors/release-process.html (original)
+++ websites/staging/isis/trunk/content/contributors/release-process.html Sun Dec 16 12:00:06 2012
@@ -818,15 +818,22 @@ Unfortunately, Nexus does not seem to al
<h3>Push changes</h3>
-<p>Finally, push the tag that was created locally to the central origin server, for example:</p>
+<p>Finally, push both the branch and the tag created locally to the central origin server. For the tag, we append an <code>-RCn</code> suffix until the vote succeeds. </p>
+
+<p>To push the branch, for example:</p>
+
+<pre>
+git checkout prepare/isis-1.2.3
+git push -u origin prepare/1.2.3
+</pre>
+
+<p>To push the tag, with the <code>-RCn</code> suffix, for example:</p>
<pre>
-git push origin tag release/core/1.2.3
+git push origin refs/tags/isis-1.2.3:refs/tags/isis-1.2.3-RC1
</pre>
-<p><div class="note">
-The remote tag isn't visible locally (eg via <code>gitk --all</code>), but can be seen <a href="https://git-wip-us.apache.org/repos/asf/isis/repo?p=isis.git;a=summary">online</a>
-</div></p>
+<p>The remote tag isn't visible locally (eg via <code>gitk --all</code>), but can be seen <a href="https://git-wip-us.apache.org/repos/asf/isis/repo?p=isis.git;a=summary">online</a>.</p>
<h2>Voting</h2>
@@ -879,7 +886,7 @@ Please verify the release and cast your
[RESULT] [VOTE] Apache Isis Core release 1.2.3
</pre>
-<p>for a successful vote, using the body:</p>
+<p>using the body (alter last line as appropriate):</p>
<pre>
The vote has completed with the following result :
@@ -890,12 +897,52 @@ The vote has completed with the followin
-1 (binding): <i>list of names</i>
-1 (non binding): <i>list of names</i>
-The vote is SUCCESSFUL.
+The vote is (UN)SUCCESSFUL.
+</pre>
+
+<h3>For a successful vote</h3>
+
+<p>If the vote has been successful, then replace the <code>-RCn</code> tag with another without the qualifier:</p>
+
+<ul>
+<li>checkout the tag locally, for example:</li>
+</ul>
+
+<pre>
+ git checkout isis-1.2.3
+</pre>
+
+<ul>
+<li>add the new remote tag, for example:</li>
+</ul>
+
+<pre>
+ git push origin refs/tags/isis-1.2.3:refs/tags/isis-1.2.3
</pre>
+<ul>
+<li>delete the <code>-RCn</code> remote tag, for example:</li>
+</ul>
+
+<pre>
+ git push origin --delete refs/tags/isis-1.2.3-RC1
+</pre>
+
+<p>Then, continue onto the next section for the steps to promote and announce the release.</p>
+
+<h3>For an unsuccessful vote</h3>
+
<p>If the vote has been unsuccessful, then:</p>
<ul>
+<li>delete the remote branch, for example:</li>
+</ul>
+
+<pre>
+ git push --origin --delete prepare/isis-1.2.3
+</pre>
+
+<ul>
<li>delete your local branch, for example:</li>
</ul>
@@ -904,19 +951,19 @@ The vote is SUCCESSFUL.
</pre>
<ul>
-<li>delete the tag that was created locally, for example:</li>
+<li>delete the remote origin server's tag, for example:</li>
</ul>
<pre>
- git tag -d isis-1.2.3
+ git push origin --delete refs/tags/isis-1.2.3-RC1
</pre>
<ul>
-<li>delete the remote origin server's tag, for example:</li>
+<li>delete the tag that was created locally, for example:</li>
</ul>
<pre>
- git push origin --delete tag isis-1.2.3
+ git tag -d isis-1.2.3
</pre>
<ul>