You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@kylin.apache.org by li...@apache.org on 2018/07/23 14:08:55 UTC
svn commit: r1836497 - in /kylin/site: development/howto_package.html
development/howto_release.html feed.xml
Author: lidong
Date: Mon Jul 23 14:08:55 2018
New Revision: 1836497
URL: http://svn.apache.org/viewvc?rev=1836497&view=rev
Log:
update how to release
Modified:
kylin/site/development/howto_package.html
kylin/site/development/howto_release.html
kylin/site/feed.xml
Modified: kylin/site/development/howto_package.html
URL: http://svn.apache.org/viewvc/kylin/site/development/howto_package.html?rev=1836497&r1=1836496&r2=1836497&view=diff
==============================================================================
--- kylin/site/development/howto_package.html (original)
+++ kylin/site/development/howto_package.html Mon Jul 23 14:08:55 2018
@@ -5427,16 +5427,6 @@ build/script/package.sh -P cdh5.7
</code></pre>
</div>
-<h5 id="build-package-for-hbase-098x">Build Package for HBase 0.98.x</h5>
-
-<p>Source code for HBase 0.98.x is in another branch named master-hbase0.98, and you need to switch to this branch before build the package.</p>
-
-<div class="highlighter-rouge"><pre class="highlight"><code>cd kylin
-git checkout master-hbase0.98
-build/script/package.sh
-</code></pre>
-</div>
-
</article>
</div>
</div>
Modified: kylin/site/development/howto_release.html
URL: http://svn.apache.org/viewvc/kylin/site/development/howto_release.html?rev=1836497&r1=1836496&r2=1836497&view=diff
==============================================================================
--- kylin/site/development/howto_release.html (original)
+++ kylin/site/development/howto_release.html Mon Jul 23 14:08:55 2018
@@ -5417,7 +5417,7 @@ Install gpg (On Mac OS X as sample): <b
<p>Generate gpg key: <br />
Reference: <a href="https://www.gnupg.org/gph/en/manual/c14.html">https://www.gnupg.org/gph/en/manual/c14.html</a> <br />
<em>All new RSA keys generated should be at least 4096 bits. Do not generate new DSA keys</em> <br />
-<code class="highlighter-rouge">gpg --gen-key</code></p>
+<code class="highlighter-rouge">gpg --full-generate-key</code></p>
<p>Verify your key: <br />
<code class="highlighter-rouge">gpg --list-sigs YOUR_NAME</code></p>
@@ -5454,10 +5454,11 @@ For example: <br />
<ul>
<li>Set up signing keys as described above.</li>
- <li>Make sure you are using JDK 1.7 (not 1.8).</li>
+ <li>Make sure you are using JDK 1.8.</li>
<li>Make sure you are using GIT 2.7.2 or above.</li>
<li>Make sure you are working on right release version number.</li>
<li>Make sure that every âresolvedâ JIRA case (including duplicates) has a fix version assigned.</li>
+ <li>Make sure you are working in clean dir</li>
</ul>
<p><strong>Configure Apache repository server in Maven</strong><br />
@@ -5526,17 +5527,13 @@ If youâre the first time to do rele
<div class="highlight"><pre><code class="language-bash" data-lang="bash"><span class="gp">$ </span>mvn -Papache-release -DskipTests -Dgpg.passphrase<span class="o">=</span><span class="k">${</span><span class="nv">GPG_PASSPHRASE</span><span class="k">}</span> deploy</code></pre></div>
-<p><strong>Prepare and dry run a release</strong></p>
+<p><strong>Prepare</strong></p>
<p>Create a release branch named after the release, e.g. v0.7.2-release, and 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>
-<p>We will use the branch for the entire the release process. Meanwhile, we do not allow commits to the master branch. After the release is final, we can use <code class="highlighter-rouge">git merge --ff-only</code> to append the changes on the release branch onto the master branch. (Apache does not allow reverts to the master branch, which makes it difficult to clean up the kind of messy commits that inevitably happen while you are trying to finalize a release.)</p>
-
-<p>Now, set up your environment and do an optional dry run. The dry run will not commit any changes back to git and gives you the opportunity to verify that the release process will complete as expected.</p>
-
<p>If any of the steps fail, clean up (see below), fix the problem, and start again from the top.</p>
<div class="highlight"><pre><code class="language-bash" data-lang="bash"><span class="c"># Set passphrase variable without putting it into shell history</span>
@@ -5577,6 +5574,24 @@ Now, run the release for real.</p>
<span class="c"># Perform checks out the tagged version, builds, and deploys to the staging repository</span>
<span class="gp">$ </span>mvn -DskipTests -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:perform</code></pre></div>
+<p><strong>Cleaning up after a failed release attempt:</strong></p>
+
+<div class="highlight"><pre><code class="language-bash" data-lang="bash"><span class="c"># Make sure that the tag you are about to generate does not already</span>
+<span class="c"># exist (due to a failed release attempt)</span>
+<span class="gp">$ </span>git tag
+
+<span class="c"># If the tag exists, delete it locally and remotely</span>
+<span class="gp">$ </span>git tag -d kylin-X.Y.Z
+<span class="gp">$ </span>git push origin :refs/tags/kylin-X.Y.Z
+
+<span class="c"># Remove modified files</span>
+<span class="gp">$ </span>mvn release:clean
+
+<span class="c"># Check whether there are modified files and if so, go back to the</span>
+<span class="c"># original git commit</span>
+<span class="gp">$ </span>git status
+<span class="gp">$ </span>git reset --hard HEAD</code></pre></div>
+
<p><strong>Close the staged artifacts in the Nexus repository:</strong></p>
<ul>
@@ -5638,10 +5653,10 @@ Upload the artifacts via subversion to a
<span class="gp">$ </span>curl -O https://dist.apache.org/repos/dist/release/kylin/KEYS
<span class="c">## Sign/check md5 and sha1 hashes</span>
- _<span class="o">(</span>Assumes your O/S has <span class="s1">'md5'</span> and <span class="s1">'sha1'</span> commands.<span class="o">)</span>_
+ _<span class="o">(</span>Assumes your O/S has <span class="s1">'md5'</span> and <span class="s1">'openssl'</span> commands.<span class="o">)</span>_
<span class="k">function </span>checkHash<span class="o">()</span> <span class="o">{</span>
<span class="nb">cd</span> <span class="s2">"</span><span class="nv">$1</span><span class="s2">"</span>
- <span class="k">for </span>i <span class="k">in</span> <span class="k">*</span>.<span class="o">{</span>zip,gz<span class="o">}</span>; <span class="k">do
+ <span class="k">for </span>i <span class="k">in</span> <span class="k">*</span>.<span class="o">{</span>zip,asc<span class="o">}</span>; <span class="k">do
if</span> <span class="o">[</span> ! -f <span class="nv">$i</span> <span class="o">]</span>; <span class="k">then
continue
fi
@@ -5651,22 +5666,16 @@ Upload the artifacts via subversion to a
<span class="k">else
</span><span class="nb">echo</span> <span class="nv">$i</span>.md5 does not match
<span class="k">fi
- else
- </span>md5 -q <span class="nv">$i</span> > <span class="nv">$i</span>.md5
- <span class="nb">echo</span> <span class="nv">$i</span>.md5 created
- <span class="k">fi
+ fi
if</span> <span class="o">[</span> -f <span class="nv">$i</span>.sha1 <span class="o">]</span>; <span class="k">then
- if</span> <span class="o">[</span> <span class="s2">"</span><span class="k">$(</span>cat <span class="nv">$i</span>.sha1<span class="k">)</span><span class="s2">"</span> <span class="o">=</span> <span class="s2">"</span><span class="k">$(</span>sha1 -q <span class="nv">$i</span><span class="k">)</span><span class="s2">"</span> <span class="o">]</span>; <span class="k">then
+ if</span> <span class="o">[</span> <span class="s2">"</span><span class="k">$(</span>cat <span class="nv">$i</span>.sha1<span class="k">)</span><span class="s2">"</span> <span class="o">=</span> <span class="s2">"</span><span class="k">$(</span>openssl sha1 <span class="nv">$i</span> | cut -d <span class="s1">' '</span> -f 2<span class="k">)</span><span class="s2">"</span> <span class="o">]</span>; <span class="k">then
</span><span class="nb">echo</span> <span class="nv">$i</span>.sha1 present and correct
<span class="k">else
</span><span class="nb">echo</span> <span class="nv">$i</span>.sha1 does not match
<span class="k">fi
- else
- </span>sha1 -q <span class="nv">$i</span> > <span class="nv">$i</span>.sha1
- <span class="nb">echo</span> <span class="nv">$i</span>.sha1 created
- <span class="k">fi
+ fi
done</span>
-<span class="o">}</span>
+<span class="o">}</span>;
<span class="gp">$ </span>checkHash apache-kylin-X.Y.Z-rcN</code></pre></div>
<h2 id="apache-voting-process">Apache voting process</h2>
Modified: kylin/site/feed.xml
URL: http://svn.apache.org/viewvc/kylin/site/feed.xml?rev=1836497&r1=1836496&r2=1836497&view=diff
==============================================================================
--- kylin/site/feed.xml (original)
+++ kylin/site/feed.xml Mon Jul 23 14:08:55 2018
@@ -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, 19 Jul 2018 06:59:26 -0700</pubDate>
- <lastBuildDate>Thu, 19 Jul 2018 06:59:26 -0700</lastBuildDate>
+ <pubDate>Mon, 23 Jul 2018 06:59:39 -0700</pubDate>
+ <lastBuildDate>Mon, 23 Jul 2018 06:59:39 -0700</lastBuildDate>
<generator>Jekyll v2.5.3</generator>
<item>