You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@dubbo.apache.org by je...@apache.org on 2018/09/20 01:46:30 UTC
[incubator-dubbo-website] branch asf-site updated: optimize apache
release flow
This is an automated email from the ASF dual-hosted git repository.
jerrick pushed a commit to branch asf-site
in repository https://gitbox.apache.org/repos/asf/incubator-dubbo-website.git
The following commit(s) were added to refs/heads/asf-site by this push:
new 3a6bf3a optimize apache release flow
3a6bf3a is described below
commit 3a6bf3a9ca9f4865a6f432e5fb2d767787bc822e
Author: zhuyong <yo...@alibaba-inc.com>
AuthorDate: Thu Sep 20 09:46:04 2018 +0800
optimize apache release flow
---
blog/zh-cn/prepare-an-apache-release.md | 24 +++++++++++++-----------
zh-cn/blog/dubbo-meetup-chengdu.html | 4 ++--
zh-cn/blog/dubbo-meetup-chengdu.json | 2 +-
zh-cn/blog/prepare-an-apache-release.html | 24 ++++++++++++------------
zh-cn/blog/prepare-an-apache-release.json | 2 +-
5 files changed, 29 insertions(+), 27 deletions(-)
diff --git a/blog/zh-cn/prepare-an-apache-release.md b/blog/zh-cn/prepare-an-apache-release.md
index 0faaf03..4458eaa 100644
--- a/blog/zh-cn/prepare-an-apache-release.md
+++ b/blog/zh-cn/prepare-an-apache-release.md
@@ -33,7 +33,7 @@ keywords: Dubbo, Apache, Release
- 根据提示，生成key
```shell
- $ gpg2 --full-gen-key
+ $ gpg --full-gen-key
gpg (GnuPG) 2.0.12; Copyright (C) 2009 Free Software Foundation, Inc.
This is free software: you are free to change and redistribute it.
There is NO WARRANTY, to the extent permitted by law.
@@ -93,9 +93,11 @@ keywords: Dubbo, Apache, Release
default-key 28681CB1
```
+ PS: 最新版本经过实测，本地没有gpg.conf这个文件，因此如果在执行过程中遇到签名失败，可以参考这个文章：https://blog.csdn.net/wenbo20182/article/details/72850810 或 https://d.sb/2016/11/gpg-inappropriate-ioctl-for-device-errors
+
3. 设置Apache中央仓库
- - Dubbo项目的父pom为apache pom
+ - Dubbo项目的父pom为apache pom(2.6.x发布版本不需要此操作)
```xml
<parent>
@@ -141,7 +143,7 @@ keywords: Dubbo, Apache, Release
1. 从主干分支拉取新分支作为发布分支，如现在要发布${release_version}版本，则从2.6.x拉出新分支${release_version}-release，此后${release_version} Release Candidates涉及的修改及打标签等都在${release_version}-release分支进行，最终发布完成后合入主干分支。
-2. 首先，在${release_version}-release分支验证maven组件打包、source源码打包、签名等是否都正常工作
+2. 首先，在${release_version}-release分支验证maven组件打包、source源码打包、签名等是否都正常工作(2.6.x记得要使用1.7或以下版本JDK进行编译打包)
```shell
$ mvn clean install -Papache-release
@@ -154,14 +156,14 @@ keywords: Dubbo, Apache, Release
- 先用dryRun验证是否ok
```shell
- $ mvn release:prepare -Papache-release -Darguments="-DskipTests" -DautoVersionSubmodules=true -Dusername=YOUR GITHUB ID -DdryRun=true
+ $ mvn release:prepare -Prelease -Darguments="-DskipTests" -DautoVersionSubmodules=true -Dusername=YOUR GITHUB ID -DdryRun=true
```
- 验证通过后，执行release:prepare
```shell
$ mvn release:clean
- $ mvn release:prepare -Papache-release -Darguments="-DskipTests" -DautoVersionSubmodules=true -Dusername=YOUR GITHUB ID
+ $ mvn release:prepare -Prelease -Darguments="-DskipTests" -DautoVersionSubmodules=true -Dusername=YOUR GITHUB ID
# 执行完成后：1.生成source.zip包； 2.打出tag，并推送到github仓库； 3.分支版本自动升级为${release_version}-SNAPSHOT，并将修改推送到github仓库
```
@@ -169,9 +171,11 @@ keywords: Dubbo, Apache, Release
```shell
$ mvn -Prelease release:perform -Darguments="-DskipTests" -DautoVersionSubmodules=true -Dusername=YOUR GITHUB ID
- # 所有artifacts发布到配置的远程maven中央仓库，处于staging状态
+ # 所有artifacts发布到配置的远程maven中央仓库，处于staging状态，这里一定要去仓库检查一下是否完整发布上去，尤其是dubbo-parent模块
```
+ PS: 执行release插件时，需要输入github的密码，这里不是输入web页面的登录密码，而是一个token，详见这里：https://help.github.com/articles/creating-a-personal-access-token-for-the-command-line/
+
## 准备Apache发布
1. 准备svn本机环境（Apache使用svn托管项目的发布内容）
@@ -190,9 +194,9 @@ keywords: Dubbo, Apache, Release
$ mkdir ${release_version}
```
-4. 添加public key到[KEYS](https://dist.apache.org/repos/dist/dev/incubator/dubbo/KEYS)文件。KEYS主要是让参与投票的人在本地导入，用来校验sign的正确性
+4. 添加public key到[KEYS](https://dist.apache.org/repos/dist/dev/incubator/dubbo/KEYS)文件并提交到SVN仓库（第一次做发布的人需要做这个操作，具体操作参考KEYS文件里的说明）。KEYS主要是让参与投票的人在本地导入，用来校验sign的正确性
-5. 拷贝Dubbo根目录下的source.zip包到svn本地仓库dubbo/${release_version}
+5. 拷贝distribution/target下的source相关的包到svn本地仓库dubbo/${release_version}
6. 生成sha512签名
@@ -203,9 +207,7 @@ keywords: Dubbo, Apache, Release
7. 如果有binary release要同时发布
```shell
- # 到dubbo项目distribution的module下，执行：
- $ mvn install
- # target目录下，拷贝bin-release.zip以及bin-release.zip.asc到svn本地仓库dubbo/${release_version}
+ # distribution/target目录下，拷贝bin-release.zip以及bin-release.zip.asc到svn本地仓库dubbo/${release_version}
# 参考第6步，生成sha512签名
```
diff --git a/zh-cn/blog/dubbo-meetup-chengdu.html b/zh-cn/blog/dubbo-meetup-chengdu.html
index 732bacb..9e8d4fb 100644
--- a/zh-cn/blog/dubbo-meetup-chengdu.html
+++ b/zh-cn/blog/dubbo-meetup-chengdu.html
@@ -12,12 +12,12 @@
<link rel="stylesheet" href="/build/blogDetail.css" />
</head>
<body>
- <div id="root"><div class="blog-detail-page" data-reactroot="" data-reactid="1" data-react-checksum="-1792371601"><header class="header-container header-container-normal" data-reactid="2"><div class="header-body" data-reactid="3"><a href="/zh-cn/index.html" data-reactid="4"><img class="logo" src="/img/dubbo_colorful.png" data-reactid="5"/></a><div class="search search-normal" data-reactid="6"><span class="icon-search" data-reactid="7"></span></div><span class="language-switch language-s [...]
+ <div id="root"><div class="blog-detail-page" data-reactroot="" data-reactid="1" data-react-checksum="-226010172"><header class="header-container header-container-normal" data-reactid="2"><div class="header-body" data-reactid="3"><a href="/zh-cn/index.html" data-reactid="4"><img class="logo" src="/img/dubbo_colorful.png" data-reactid="5"/></a><div class="search search-normal" data-reactid="6"><span class="icon-search" data-reactid="7"></span></div><span class="language-switch language-sw [...]
<p><img src="../../img/blog/meetup-chengdu/all-hands.webp" alt="img"></p>
<h2>用户深度沟通交流</h2>
<p>8.26上午10:00-12:00，邀请到货车帮，云图金控，前BBD，飞鱼星四家公司开源爱好者及重度用户参与面对面交流；据参与者反馈，解答了对Dubbo的诸多疑惑，特别是如何参与贡献社区，以及捐献代码所带来的价值点。希望后面可以更加深入参与Dubbo社区及活动中。</p>
<h2>meetup活动信息</h2>
-<p>现场依旧爆满，总报名人数976，现场用户350+，直播PV 13207。</p>
+<p>本次活动依旧爆满，总报名人数976，现场用户350+，直播PV 13207。</p>
<h2>报名信息</h2>
<p>Aliware Open Source•成都站-Apache Dubbo开发者沙龙于8月26日(周日)在成都高新区天府五街200号菁蓉国际广场8号楼2楼会议厅举办，技术GG们的思想盛宴，干货与福利一个都不会少。</p>
<p>报名链接：<a href="http://www.huodongxing.com/event/7453091088400">http://www.huodongxing.com/event/7453091088400</a></p>
diff --git a/zh-cn/blog/dubbo-meetup-chengdu.json b/zh-cn/blog/dubbo-meetup-chengdu.json
index 6530597..511efdc 100644
--- a/zh-cn/blog/dubbo-meetup-chengdu.json
+++ b/zh-cn/blog/dubbo-meetup-chengdu.json
@@ -1,6 +1,6 @@
{
"filename": "dubbo-meetup-chengdu.md",
- "__html": "<h1>第四届Dubbo开发者沙龙于8月26日在成都举行</h1>\n<p><img src=\"../../img/blog/meetup-chengdu/all-hands.webp\" alt=\"img\"></p>\n<h2>用户深度沟通交流</h2>\n<p>8.26上午10:00-12:00，邀请到货车帮，云图金控，前BBD，飞鱼星四家公司开源爱好者及重度用户参与面对面交流；据参与者反馈，解答了对Dubbo的诸多疑惑，特别是如何参与贡献社区，以及捐献代码所带来的价值点。希望后面可以更加深入参与Dubbo社区及活动中。</p>\n<h2>meetup活动信息</h2>\n<p>现场依旧爆满，总报名人数976，现场用户350+，直播PV 13207。</p>\n<h2>报名信息</h2>\n<p>Aliware Open Source•成都站-Apache Dubbo开发者沙龙于8月26日(周日)在成都高新区天府五街200号菁蓉国际广场8号楼2楼会议厅举办，技术GG们的思想盛宴，干货与福利一个都不会少。</p>\n<p>报名链接：<a [...]
+ "__html": "<h1>第四届Dubbo开发者沙龙于8月26日在成都举行</h1>\n<p><img src=\"../../img/blog/meetup-chengdu/all-hands.webp\" alt=\"img\"></p>\n<h2>用户深度沟通交流</h2>\n<p>8.26上午10:00-12:00，邀请到货车帮，云图金控，前BBD，飞鱼星四家公司开源爱好者及重度用户参与面对面交流；据参与者反馈，解答了对Dubbo的诸多疑惑，特别是如何参与贡献社区，以及捐献代码所带来的价值点。希望后面可以更加深入参与Dubbo社区及活动中。</p>\n<h2>meetup活动信息</h2>\n<p>本次活动依旧爆满，总报名人数976，现场用户350+，直播PV 13207。</p>\n<h2>报名信息</h2>\n<p>Aliware Open Source•成都站-Apache Dubbo开发者沙龙于8月26日(周日)在成都高新区天府五街200号菁蓉国际广场8号楼2楼会议厅举办，技术GG们的思想盛宴，干货与福利一个都不会少。</p>\n<p>报名链接： [...]
"title": "第四届Dubbo开发者沙龙于8月26日在成都举行",
"keywords": "Dubbo, 成都, meetup",
"description": "第四届Dubbo开发者沙龙于8月26日在成都举行。"
diff --git a/zh-cn/blog/prepare-an-apache-release.html b/zh-cn/blog/prepare-an-apache-release.html
index 579cfca..4cd7e22 100644
--- a/zh-cn/blog/prepare-an-apache-release.html
+++ b/zh-cn/blog/prepare-an-apache-release.html
@@ -12,7 +12,7 @@
<link rel="stylesheet" href="/build/blogDetail.css" />
</head>
<body>
- <div id="root"><div class="blog-detail-page" data-reactroot="" data-reactid="1" data-react-checksum="1863527686"><header class="header-container header-container-normal" data-reactid="2"><div class="header-body" data-reactid="3"><a href="/zh-cn/index.html" data-reactid="4"><img class="logo" src="/img/dubbo_colorful.png" data-reactid="5"/></a><div class="search search-normal" data-reactid="6"><span class="icon-search" data-reactid="7"></span></div><span class="language-switch language-sw [...]
+ <div id="root"><div class="blog-detail-page" data-reactroot="" data-reactid="1" data-react-checksum="-73076503"><header class="header-container header-container-normal" data-reactid="2"><div class="header-body" data-reactid="3"><a href="/zh-cn/index.html" data-reactid="4"><img class="logo" src="/img/dubbo_colorful.png" data-reactid="5"/></a><div class="search search-normal" data-reactid="6"><span class="icon-search" data-reactid="7"></span></div><span class="language-switch language-swi [...]
<h2>理解Apache发布的内容和流程</h2>
<p>总的来说，Source Release是Apache关注的重点，也是发布的必须内容；而Binary Release是可选项，Dubbo可以选择是否发布二进制包到Apache仓库或者发布到Maven中央仓库。</p>
<p>请参考以下链接，找到更多关于ASF的发布指南:</p>
@@ -38,7 +38,7 @@ $ gpg --version <span class="hljs-comment">#检查版本，应该为2.x</span>
<ul>
<li>根据提示，生成key</li>
</ul>
-<pre><code class="language-shell"><span class="hljs-meta">$</span><span class="bash"> gpg2 --full-gen-key</span>
+<pre><code class="language-shell"><span class="hljs-meta">$</span><span class="bash"> gpg --full-gen-key</span>
gpg (GnuPG) 2.0.12; Copyright (C) 2009 Free Software Foundation, Inc.
This is free software: you are free to change and redistribute it.
There is NO WARRANTY, to the extent permitted by law.
@@ -94,11 +94,12 @@ $ gpg --keyserver pgpkeys.mit.edu --send-key 28681CB1
default-key 28681CB1
</code></pre>
+<p>PS: 最新版本经过实测，本地没有gpg.conf这个文件，因此如果在执行过程中遇到签名失败，可以参考这个文章：<a href="https://blog.csdn.net/wenbo20182/article/details/72850810">https://blog.csdn.net/wenbo20182/article/details/72850810</a> 或 <a href="https://d.sb/2016/11/gpg-inappropriate-ioctl-for-device-errors">https://d.sb/2016/11/gpg-inappropriate-ioctl-for-device-errors</a></p>
</li>
<li>
<p>设置Apache中央仓库</p>
<ul>
-<li>Dubbo项目的父pom为apache pom</li>
+<li>Dubbo项目的父pom为apache pom(2.6.x发布版本不需要此操作)</li>
</ul>
<pre><code class="language-xml"><span class="hljs-tag"><<span class="hljs-name">parent</span>></span>
<span class="hljs-tag"><<span class="hljs-name">groupId</span>></span>org.apache<span class="hljs-tag"></<span class="hljs-name">groupId</span>></span>
@@ -145,7 +146,7 @@ default-key 28681CB1
<p>从主干分支拉取新分支作为发布分支，如现在要发布${release_version}版本，则从2.6.x拉出新分支${release_version}-release，此后${release_version} Release Candidates涉及的修改及打标签等都在${release_version}-release分支进行，最终发布完成后合入主干分支。</p>
</li>
<li>
-<p>首先，在${release_version}-release分支验证maven组件打包、source源码打包、签名等是否都正常工作</p>
+<p>首先，在${release_version}-release分支验证maven组件打包、source源码打包、签名等是否都正常工作(2.6.x记得要使用1.7或以下版本JDK进行编译打包)</p>
<pre><code class="language-shell"><span class="hljs-meta">$</span><span class="bash"> mvn clean install -Papache-release</span>
<span class="hljs-meta">$</span><span class="bash"> mvn deploy</span>
<span class="hljs-meta">#</span><span class="bash"> 将snapshot包推送到maven中央仓库，处于staging状态</span>
@@ -156,21 +157,22 @@ default-key 28681CB1
<ul>
<li>先用dryRun验证是否ok</li>
</ul>
-<pre><code class="language-shell"><span class="hljs-meta">$</span><span class="bash"> mvn release:prepare -Papache-release -Darguments=<span class="hljs-string">"-DskipTests"</span> -DautoVersionSubmodules=<span class="hljs-literal">true</span> -Dusername=YOUR GITHUB ID -DdryRun=<span class="hljs-literal">true</span></span>
+<pre><code class="language-shell"><span class="hljs-meta">$</span><span class="bash"> mvn release:prepare -Prelease -Darguments=<span class="hljs-string">"-DskipTests"</span> -DautoVersionSubmodules=<span class="hljs-literal">true</span> -Dusername=YOUR GITHUB ID -DdryRun=<span class="hljs-literal">true</span></span>
</code></pre>
<ul>
<li>验证通过后，执行release:prepare</li>
</ul>
<pre><code class="language-shell"><span class="hljs-meta">$</span><span class="bash"> mvn release:clean</span>
-<span class="hljs-meta">$</span><span class="bash"> mvn release:prepare -Papache-release -Darguments=<span class="hljs-string">"-DskipTests"</span> -DautoVersionSubmodules=<span class="hljs-literal">true</span> -Dusername=YOUR GITHUB ID</span>
+<span class="hljs-meta">$</span><span class="bash"> mvn release:prepare -Prelease -Darguments=<span class="hljs-string">"-DskipTests"</span> -DautoVersionSubmodules=<span class="hljs-literal">true</span> -Dusername=YOUR GITHUB ID</span>
<span class="hljs-meta">#</span><span class="bash"> 执行完成后：1.生成source.zip包； 2.打出tag，并推送到github仓库； 3.分支版本自动升级为<span class="hljs-variable">${release_version}</span>-SNAPSHOT，并将修改推送到github仓库</span>
</code></pre>
<ul>
<li>执行release:perform，做正式发布</li>
</ul>
<pre><code class="language-shell"><span class="hljs-meta">$</span><span class="bash"> mvn -Prelease release:perform -Darguments=<span class="hljs-string">"-DskipTests"</span> -DautoVersionSubmodules=<span class="hljs-literal">true</span> -Dusername=YOUR GITHUB ID</span>
-<span class="hljs-meta">#</span><span class="bash"> 所有artifacts发布到配置的远程maven中央仓库，处于staging状态</span>
+<span class="hljs-meta">#</span><span class="bash"> 所有artifacts发布到配置的远程maven中央仓库，处于staging状态，这里一定要去仓库检查一下是否完整发布上去，尤其是dubbo-parent模块</span>
</code></pre>
+<p>PS: 执行release插件时，需要输入github的密码，这里不是输入web页面的登录密码，而是一个token，详见这里：<a href="https://help.github.com/articles/creating-a-personal-access-token-for-the-command-line/">https://help.github.com/articles/creating-a-personal-access-token-for-the-command-line/</a></p>
</li>
</ol>
<h2>准备Apache发布</h2>
@@ -191,10 +193,10 @@ default-key 28681CB1
</code></pre>
</li>
<li>
-<p>添加public key到<a href="https://dist.apache.org/repos/dist/dev/incubator/dubbo/KEYS">KEYS</a>文件。KEYS主要是让参与投票的人在本地导入，用来校验sign的正确性</p>
+<p>添加public key到<a href="https://dist.apache.org/repos/dist/dev/incubator/dubbo/KEYS">KEYS</a>文件并提交到SVN仓库（第一次做发布的人需要做这个操作，具体操作参考KEYS文件里的说明）。KEYS主要是让参与投票的人在本地导入，用来校验sign的正确性</p>
</li>
<li>
-<p>拷贝Dubbo根目录下的source.zip包到svn本地仓库dubbo/${release_version}</p>
+<p>拷贝distribution/target下的source相关的包到svn本地仓库dubbo/${release_version}</p>
</li>
<li>
<p>生成sha512签名</p>
@@ -203,9 +205,7 @@ default-key 28681CB1
</li>
<li>
<p>如果有binary release要同时发布</p>
-<pre><code class="language-shell"><span class="hljs-meta">#</span><span class="bash"> 到dubbo项目distribution的module下，执行：</span>
-<span class="hljs-meta">$</span><span class="bash"> mvn install</span>
-<span class="hljs-meta">#</span><span class="bash"> target目录下，拷贝bin-release.zip以及bin-release.zip.asc到svn本地仓库dubbo/<span class="hljs-variable">${release_version}</span></span>
+<pre><code class="language-shell"><span class="hljs-meta">#</span><span class="bash"> distribution/target目录下，拷贝bin-release.zip以及bin-release.zip.asc到svn本地仓库dubbo/<span class="hljs-variable">${release_version}</span></span>
<span class="hljs-meta">#</span><span class="bash"> 参考第6步，生成sha512签名</span>
</code></pre>
</li>
diff --git a/zh-cn/blog/prepare-an-apache-release.json b/zh-cn/blog/prepare-an-apache-release.json
index c814163..6e360cc 100644
--- a/zh-cn/blog/prepare-an-apache-release.json
+++ b/zh-cn/blog/prepare-an-apache-release.json
@@ -1,6 +1,6 @@
{
"filename": "prepare-an-apache-release.md",
- "__html": "<h1>如何准备Apache Release</h1>\n<h2>理解Apache发布的内容和流程</h2>\n<p>总的来说，Source Release是Apache关注的重点，也是发布的必须内容；而Binary Release是可选项，Dubbo可以选择是否发布二进制包到Apache仓库或者发布到Maven中央仓库。</p>\n<p>请参考以下链接，找到更多关于ASF的发布指南:</p>\n<ul>\n<li><a href=\"http://www.apache.org/dev/release-publishing\">Apache Release Guide</a></li>\n<li><a href=\"http://www.apache.org/dev/release.html\">Apache Release Policy</a></li>\n<li><a href=\"http://www.apache.org/dev/publishing-maven-artifacts.html\">Maven Release Info</ [...]
+ "__html": "<h1>如何准备Apache Release</h1>\n<h2>理解Apache发布的内容和流程</h2>\n<p>总的来说，Source Release是Apache关注的重点，也是发布的必须内容；而Binary Release是可选项，Dubbo可以选择是否发布二进制包到Apache仓库或者发布到Maven中央仓库。</p>\n<p>请参考以下链接，找到更多关于ASF的发布指南:</p>\n<ul>\n<li><a href=\"http://www.apache.org/dev/release-publishing\">Apache Release Guide</a></li>\n<li><a href=\"http://www.apache.org/dev/release.html\">Apache Release Policy</a></li>\n<li><a href=\"http://www.apache.org/dev/publishing-maven-artifacts.html\">Maven Release Info</ [...]
"title": "如何准备Apache Release",
"keywords": "Dubbo, Apache, Release"
}
\ No newline at end of file