This is an automated email from the ASF dual-hosted git repository.
peacewong pushed a commit to branch dev
in repository https://gitbox.apache.org/repos/asf/incubator-linkis-website.git
The following commit(s) were added to refs/heads/dev by this push:
new 435f7bd update how-to-release.md
new 6c50c39 Merge pull request #130 from casionone/dev
435f7bd is described below
commit 435f7bd2a2c44ca87d799dd9add6f22a3e0f8418
Author: casionone <[email protected]>
AuthorDate: Fri Jan 28 10:44:11 2022 +0800
update how-to-release.md
---
community/how-to-release.md | 65 ++++++++++------------
.../current/how-to-release.md | 41 +++++---------
2 files changed, 43 insertions(+), 63 deletions(-)
diff --git a/community/how-to-release.md b/community/how-to-release.md
index 51c9c81..968e43f 100644
--- a/community/how-to-release.md
+++ b/community/how-to-release.md
@@ -631,67 +631,58 @@ On behalf of Apache Linkis(Incubating) community
```
## 6 Official release
-### 6.1 Merging branches
+### 6.1 Migrating source and binary packages
-Merge the changes from the `${release_version}-RC` branch to the `master`
branch, and delete the `${release_version}-RC` branch after the merge is
completed
-
-```shell
-$ git checkout master
-$ git merge origin/${release_version}-RC
-$ git pull
-$ git push origin master
-$ git push --delete origin ${release_version}-RC
-$ git branch -d ${release_version}-RC
-```
-
-### 6.2 Migrating source and binary packages
-
-Move the source and binary packages from the `dev` directory of svn to the
`release` directory
+Move source and binary packages from svn's `dev` directory to the `release`
directory
```shell
#Mobile source package and binary package
-$ svn mv
https://dist.apache.org/repos/dist/dev/incubator/linkis/${release_version}-${rc_version}
https://dist.apache.org/repos/dist/release/incubator/ linkis/ -m "transfer
packages for ${release_version}-${rc_version}"
+$ svn mv
https://dist.apache.org/repos/dist/dev/incubator/linkis/${release_version}-${rc_version}
https://dist.apache.org/repos/dist/release/incubator/ linkis/ -m "transfer
packages for ${release_version}-${rc_version}"
+
# The following operations decide whether to update the key of the release
branch according to the actual situation
-# Remove KEYS in the original release directory
-$ svn delete https://dist.apache.org/repos/dist/release/incubator/linkis/KEYS
-m "delete KEYS"
-#copy dev directory KEYS to release directory
-$ svn cp https://dist.apache.org/repos/dist/dev/incubator/linkis/KEYS
https://dist.apache.org/repos/dist/release/incubator/linkis/ -m "transfer KEYS
for ${release_version}-${rc_version}"
+# Clear the KEYS in the original release directory
+$ svn delete https://dist.apache.org/repos/dist/release/incubator/linkis/KEYS
-m "delete KEYS"
+
+# Copy the dev directory KEYS to the release directory
+$ svn cp https://dist.apache.org/repos/dist/dev/incubator/linkis/KEYS
https://dist.apache.org/repos/dist/release/incubator/linkis/ -m "transfer KEYS
for ${release_version}-${rc_version}"
```
-### 6.3 Confirm whether the packages under dev and release are correct
+### 6.2 Confirm whether the packages under dev and release are correct
-- Confirm that `${release_version}-${rc_version}` under
[dev](https://dist.apache.org/repos/dist/dev/incubator/linkis/) has been deleted
-- Delete the release package of the previous version in the
[release](https://dist.apache.org/repos/dist/release/incubator/linkis/)
directory, these packages will be automatically saved in [here](https:/
/archive.apache.org/dist/incubator/linkis/)
+- Confirm that `${release_version}-${rc_version}` under
[dev](https://dist.apache.org/repos/dist/dev/incubator/linkis/) has been removed
+- Delete the release packages of the previous version in the
[release](https://dist.apache.org/repos/dist/release/incubator/linkis/)
directory, these packages will be automatically saved [here](https:/
/archive.apache.org/dist/incubator/linkis/)
```shell
+#Before deleting, please confirm that the previous version release package has
been updated to https://archive.apache.org/dist/incubator/linkis/
$ svn delete
https://dist.apache.org/repos/dist/release/incubator/linkis/${last_release_version}
-m "Delete ${last_release_version}"
-```
+````
-### 6.4 Release version in Apache Staging repository
+### 6.3 Release version in Apache Staging repository
-- Log in to http://repository.apache.org and log in with your Apache account
+- Log in to http://repository.apache.org , log in with your Apache account
- Click on Staging repositories on the left,
-- Search for Linkis keywords, select your recently uploaded repository, and
vote for the repository specified in the email
-- Click the `Release` button above, a series of checks will be carried out in
this process
+- Search for Linkis keywords, select your recently uploaded repository, and
the repository specified in the voting email
+- Click the `Release` button above, this process will perform a series of
checks
> It usually takes 24 hours to wait for the repository to synchronize to other
> data sources
-### 6.5 GitHub version released
-- Tag the branch based on the final release or commit id.
-- Click `Edit` on the version `${release_version}` on the [GitHub
Releases](https://github.com/apache/incubator/linkis/releases) page. Edit the
version number and version description, and click `Publish release`
+### 6.4 Update download page
+
+<font color='red'>Chinese and English documents should be updated</font>
-### 6.6 Update download page
-<font color='red'>Chinese and English documents must be updated</font>
-The linkis official website download address should point to the official
apache address
+The official website download address of linkis should point to the official
address of apache
-After waiting and confirming that the new release version is synchronized to
the Apache mirror, update the following page:
+After waiting and confirming that the new release version is synced to the
Apache mirror (https://archive.apache.org/dist/incubator/linkis/), update the
following page:
-- https://linkis.apache.org/zh-CN/download/main
+- https://linkis.apache.org/en-US/download/main
- https://linkis.apache.org/download/main
-The download connection of the GPG signature file and the hash verification
file should use this prefix: `https://downloads.apache.org/incubator/linkis/`
+### 6.5 GitHub version released
+1. Merge `${release_version}-RC` branch to `master` branch (if not merged)
+2. Tag the official version, and the RC version tag during the voting process
can be removed
+3. On the [GitHub
Releases](https://github.com/apache/incubator-linkis/releases) page, update the
version number and version description, etc.
## 7 Email notification version is released
diff --git
a/i18n/zh-CN/docusaurus-plugin-content-docs-community/current/how-to-release.md
b/i18n/zh-CN/docusaurus-plugin-content-docs-community/current/how-to-release.md
index 59f7a8a..de9213d 100644
---
a/i18n/zh-CN/docusaurus-plugin-content-docs-community/current/how-to-release.md
+++
b/i18n/zh-CN/docusaurus-plugin-content-docs-community/current/how-to-release.md
@@ -471,7 +471,7 @@ WIP的使用，详细可见 https://issues.apache.org/jira/browse/LEGAL-469
#### 5.1.1 Linkis 社区投票模板
-
+参考示例:[\[VOTE\] Release Apache Linkis (Incubating)
1.0.3-RC2](https://lists.apache.org/thread/8j8f8vqotpg4f2kjwq3gg436vtx40p20)
https://lists.apache.org/thread/8j8f8vqotpg4f2kjwq3gg436vtx40p20
```html
标题：
[VOTE] Release Apache Linkis (Incubating) ${release_version} ${rc_version}
@@ -528,7 +528,7 @@ ${Linkis Release Manager}
```
#### 5.1.2 宣布投票结果模板
-
+参考示例:[\[RESULT\]\[VOTE\] Release Apache Linkis (Incubating)
1.0.3-RC2](https://lists.apache.org/thread/gh1b1t3cjom8bq9o3xbntbjgrkp0vly3)
https://lists.apache.org/thread/gh1b1t3cjom8bq9o3xbntbjgrkp0vly3
```html
标题：
[RESULT][VOTE] Release Apache Linkis (Incubating) ${release_version}
${rc_version}
@@ -559,6 +559,8 @@ ${Linkis Release Manager}
#### 5.2.1 Incubator 社区投票模板
+参考示例:[\[VOTE\] Release Apache Linkis (Incubating)
1.0.3-RC2](https://lists.apache.org/thread/9jr6hsf53jmwvnkh8nkt6spwcwc1q42j)
https://lists.apache.org/thread/9jr6hsf53jmwvnkh8nkt6spwcwc1q42j
+
```html
标题：[VOTE] Release Apache Linkis(Incubating) ${release_version} ${rc_version}
@@ -616,6 +618,7 @@ On behalf of Apache Linkis(Incubating) community
#### 5.2.2 宣布投票结果模板
+参考示例:[\[RESULT\]\[VOTE\] Release Apache Linkis (Incubating)
1.0.3-RC2](https://lists.apache.org/thread/l6xtpt8g1wxwnbotods11fzd1hkoqx63)
https://lists.apache.org/thread/l6xtpt8g1wxwnbotods11fzd1hkoqx63
```html
标题：[RESULT][VOTE] Release Apache Linkis ${release_version} {rc_version}
@@ -644,20 +647,7 @@ On behalf of Apache Linkis(Incubating) community
## 6 正式发布
-### 6.1 合并分支
-
-合并`${release_version}-RC`分支的改动到`master`分支，合并完成后删除`${release_version}-RC`分支
-
-```shell
-$ git checkout master
-$ git merge origin/${release_version}-RC
-$ git pull
-$ git push origin master
-$ git push --delete origin ${release_version}-RC
-$ git branch -d ${release_version}-RC
-```
-
-### 6.2 迁移源码与二进制包
+### 6.1 迁移源码与二进制包
将源码和二进制包从svn的`dev`目录移动到`release`目录
@@ -673,16 +663,17 @@ $ svn delete
https://dist.apache.org/repos/dist/release/incubator/linkis/KEYS -m
$ svn cp https://dist.apache.org/repos/dist/dev/incubator/linkis/KEYS
https://dist.apache.org/repos/dist/release/incubator/linkis/ -m "transfer KEYS
for ${release_version}-${rc_version}"
```
-### 6.3 确认dev和release下的包是否正确
+### 6.2 确认dev和release下的包是否正确
-
确认[dev](https://dist.apache.org/repos/dist/dev/incubator/linkis/)下的`${release_version}-${rc_version}`已被删除
- 删除[release](https://dist.apache.org/repos/dist/release/incubator/linkis/)目录下
上一个版本的发布包，这些包会被自动保存在[这里](https://archive.apache.org/dist/incubator/linkis/)
```shell
+#删除前请确认上一个版本发布包已更新至https://archive.apache.org/dist/incubator/linkis/
$ svn delete
https://dist.apache.org/repos/dist/release/incubator/linkis/${last_release_version}
-m "Delete ${last_release_version}"
```
-### 6.4 在Apache Staging仓库发布版本
+### 6.3 在Apache Staging仓库发布版本
- 登录 http://repository.apache.org , 使用Apache账号登录
- 点击左侧的 Staging repositories，
@@ -691,25 +682,23 @@ $ svn delete
https://dist.apache.org/repos/dist/release/incubator/linkis/${last_
> 等仓库同步到其他数据源，一般需要24小时
-### 6.5 GitHub 版本发布
-
-1. 基于最终发布的分支或则commit id打上tag。
-
-2. 在 [GitHub Releases](https://github.com/apache/incubator/linkis/releases)
页面的 `${release_version}` 版本上点击 `Edit` 编辑版本号及版本说明，并点击 `Publish release`
-### 6.6 更新下载页面
+### 6.4 更新下载页面
<font color='red'>中英文文档都要更新</font>
linkis的官网下载地址应该指向apache的官方地址
-等待并确认新的发布版本同步至 Apache 镜像后，更新如下页面：
+等待并确认新的发布版本同步至Apache镜像(https://archive.apache.org/dist/incubator/linkis/)
后，更新如下页面：
- https://linkis.apache.org/zh-CN/download/main
- https://linkis.apache.org/download/main
-GPG签名文件和哈希校验文件的下载连接应该使用这个前缀：`https://downloads.apache.org/incubator/linkis/`
+### 6.5 GitHub 版本发布
+1. 合并`${release_version}-RC`分支到`master`分支(如果未合并)
+2. 打正式版本tag，投票过程中的RC版本tag可以移除
+3. 在 [GitHub Releases](https://github.com/apache/incubator-linkis/releases)
页面，更新版本号及版本说明等
## 7 邮件通知版本发布完成
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
