svn commit: r1850860 - in /kylin/site: cn/development/howto_release.html development/howto_release.html feed.xml

[li...@apache.org]

Author: lidong
Date: Wed Jan  9 14:09:32 2019
New Revision: 1850860

URL: http://svn.apache.org/viewvc?rev=1850860&view=rev
Log:
update how to release

Modified:
    kylin/site/cn/development/howto_release.html
    kylin/site/development/howto_release.html
    kylin/site/feed.xml

Modified: kylin/site/cn/development/howto_release.html
URL: http://svn.apache.org/viewvc/kylin/site/cn/development/howto_release.html?rev=1850860&r1=1850859&r2=1850860&view=diff
==============================================================================
--- kylin/site/cn/development/howto_release.html (original)
+++ kylin/site/cn/development/howto_release.html Wed Jan  9 14:09:32 2019
@@ -312,7 +312,7 @@ var _hmt = _hmt || [];
 
 <div class="highlight"><pre><code class="language-bash" data-lang="bash">ssh -T git@github.com</code></pre></div>
 
-<p>基于要当前的开发分支，创建一个以 release 版本号命名的发布分支，例如，v2.5.0-release，并将其推到服务器端。</p>
+<p>基于要当前的开发分支，创建一个以 release 版本号命名的发布分支，例如，v2.5.0-release (注意分支名字不能与tag名字相同)，并将其推到服务器端。</p>
 
 <div class="highlight"><pre><code class="language-bash" data-lang="bash"><span class="gp">$ </span>git checkout -b vX.Y.Z-release
 <span class="gp">$ </span>git push -u origin vX.Y.Z-release</code></pre></div>
@@ -350,7 +350,8 @@ var _hmt = _hmt || [];
 <p><strong>运行真实的 release:</strong><br />
 现在真正开始 release</p>
 
-<div class="highlight"><pre><code class="language-bash" data-lang="bash"><span class="c"># Prepare sets the version numbers, creates a tag, and pushes it to git.</span>
+<div class="highlight"><pre><code class="language-bash" data-lang="bash"><span class="c"># 如果之前做了dry run，在真正开始release之前需要做清理</span>
+<span class="c"># Prepare sets the version numbers, creates a tag, and pushes it to git.</span>
 <span class="gp">$ </span>mvn -DskipTests -DreleaseVersion<span class="o">=</span>X.Y.Z -DdevelopmentVersion<span class="o">=(</span>X.Y.Z+1<span class="o">)</span>-SNAPSHOT -Papache-release -Darguments<span class="o">=</span><span class="s2">"-Dgpg.passphrase=</span><span class="k">${</span><span class="nv">GPG_PASSPHRASE</span><span class="k">}</span><span class="s2"> -DskipTests"</span> release:prepare
 
 <span class="c"># Perform checks out the tagged version, builds, and deploys to the staging repository</span>
@@ -481,7 +482,7 @@ https://people.apache.org/keys/committer
 Please vote on releasing this package as Apache Kylin X.Y.Z.
 
 The vote is open for the next 72 hours and passes if a majority of
-at least three +1 PPMC votes are cast.
+at least three +1 PMC votes are cast.
 
 [ ] +1 Release this package as Apache Kylin X.Y.Z
 [ ]  0 I don't feel strongly about it, but I'm okay with the release
@@ -594,10 +595,15 @@ svn commit -m <span class="s1">'Remove o
 </ul>
 
 <h2 id="section-4">更新源码</h2>
-<p>发布后，您需要手动更新一些源代码：</p>
+<p>发布后，您需要更新一些源代码：</p>
 
 <ul>
-  <li>更新 <code class="highlighter-rouge">KylinVersion</code> 类，将 <code class="highlighter-rouge">CURRENT_KYLIN_VERSION</code> 的值更改为当前开发版本。</li>
+  <li>
+    <p>把分布分支，如v2.5.0-release，合并到开发分支中，如2.5.x，以便开始下个版本的开发。</p>
+  </li>
+  <li>
+    <p>手动更新 <code class="highlighter-rouge">KylinVersion</code> 类，将 <code class="highlighter-rouge">CURRENT_KYLIN_VERSION</code> 的值更改为当前开发版本。</p>
+  </li>
 </ul>
 
 <h2 id="section-5">发布网站</h2>

Modified: kylin/site/development/howto_release.html
URL: http://svn.apache.org/viewvc/kylin/site/development/howto_release.html?rev=1850860&r1=1850859&r2=1850860&view=diff
==============================================================================
--- kylin/site/development/howto_release.html (original)
+++ kylin/site/development/howto_release.html Wed Jan  9 14:09:32 2019
@@ -6172,7 +6172,7 @@ If you’re the first time to do rele
 
 <div class="highlight"><pre><code class="language-bash" data-lang="bash">ssh -T git@github.com</code></pre></div>
 
-<p>Create a branch for release work from your current development branch, named with this release version, e.g. v2.5.0-release, and then push it to Apache.</p>
+<p>Create a branch for release work from your current development branch, named with this release version, e.g. v2.5.0-release (should not be the same name with the tag name), and then push it to Apache.</p>
 
 <div class="highlight"><pre><code class="language-bash" data-lang="bash"><span class="gp">$ </span>git checkout -b vX.Y.Z-release
 <span class="gp">$ </span>git push -u origin vX.Y.Z-release</code></pre></div>
@@ -6211,7 +6211,8 @@ If you’re the first time to do rele
 <p><strong>Run real release:</strong><br />
 Now, run the release for real.</p>
 
-<div class="highlight"><pre><code class="language-bash" data-lang="bash"><span class="c"># Prepare sets the version numbers, creates a tag, and pushes it to git.</span>
+<div class="highlight"><pre><code class="language-bash" data-lang="bash"><span class="c"># Note that if a dry run is done previously, need to do the cleanup first before run the release for real</span>
+<span class="c"># Prepare sets the version numbers, creates a tag, and pushes it to git.</span>
 <span class="gp">$ </span>mvn -DskipTests -DreleaseVersion<span class="o">=</span>X.Y.Z -DdevelopmentVersion<span class="o">=(</span>X.Y.Z+1<span class="o">)</span>-SNAPSHOT -Papache-release -Darguments<span class="o">=</span><span class="s2">"-Dgpg.passphrase=</span><span class="k">${</span><span class="nv">GPG_PASSPHRASE</span><span class="k">}</span><span class="s2"> -DskipTests"</span> release:prepare
 
 <span class="c"># Perform checks out the tagged version, builds, and deploys to the staging repository</span>
@@ -6330,7 +6331,7 @@ Its hash is xxx.
 The artifacts to be voted on are located here:
 https://dist.apache.org/repos/dist/dev/kylin/apache-kylin-X.Y.Z-rcN/
 
-The hashe of the artifact is as follows:
+The hash of the artifact is as follows:
 apache-kylin-X.Y.Z-source-release.zip.sha256 xxx
 
 A staged Maven repository is available for review at:
@@ -6342,7 +6343,7 @@ https://people.apache.org/keys/committer
 Please vote on releasing this package as Apache Kylin X.Y.Z.
 
 The vote is open for the next 72 hours and passes if a majority of
-at least three +1 PPMC votes are cast.
+at least three +1 PMC votes are cast.
 
 [ ] +1 Release this package as Apache Kylin X.Y.Z
 [ ]  0 I don't feel strongly about it, but I'm okay with the release
@@ -6457,10 +6458,15 @@ svn commit -m <span class="s1">'Remove o
 </ul>
 
 <h2 id="update-source-code">Update source code</h2>
-<p>After publish the release, you need to manually update some source code:</p>
+<p>After publish the release, you need to do update some source code:</p>
 
 <ul>
-  <li>Update <code class="highlighter-rouge">KylinVersion</code> class, change value of <code class="highlighter-rouge">CURRENT_KYLIN_VERSION</code> to current development version.</li>
+  <li>
+    <p>Merge the release branch, e.g. v2.5.0-release, to the current development branch, e.g. 2.5.x, for preparing the next development iteration.</p>
+  </li>
+  <li>
+    <p>Manually update <code class="highlighter-rouge">KylinVersion</code> class, change value of <code class="highlighter-rouge">CURRENT_KYLIN_VERSION</code> to current development version.</p>
+  </li>
 </ul>
 
 <h2 id="publishing-the-web-site">Publishing the web site</h2>

Modified: kylin/site/feed.xml
URL: http://svn.apache.org/viewvc/kylin/site/feed.xml?rev=1850860&r1=1850859&r2=1850860&view=diff
==============================================================================
--- kylin/site/feed.xml (original)
+++ kylin/site/feed.xml Wed Jan  9 14:09:32 2019
@@ -19,8 +19,8 @@
     <description>Apache Kylin Home</description>
     <link>http://kylin.apache.org/</link>
     <atom:link href="http://kylin.apache.org/feed.xml" rel="self" type="application/rss+xml"/>
-    <pubDate>Thu, 27 Dec 2018 05:59:28 -0800</pubDate>
-    <lastBuildDate>Thu, 27 Dec 2018 05:59:28 -0800</lastBuildDate>
+    <pubDate>Wed, 09 Jan 2019 05:59:25 -0800</pubDate>
+    <lastBuildDate>Wed, 09 Jan 2019 05:59:25 -0800</lastBuildDate>
     <generator>Jekyll v2.5.3</generator>
     
       <item>