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 15a592b update how-to-release.md
new 1f58d6e Merge pull request #123 from casionone/dev
15a592b is described below
commit 15a592b68679357620a4517182bbcfad63a3b151
Author: casionone <[email protected]>
AuthorDate: Fri Jan 21 17:15:03 2022 +0800
update how-to-release.md
---
community/how-to-release.md | 34 +++++++++++-----------
community/how-to-verify.md | 6 ++--
.../current/how-to-release.md | 34 +++++++++++-----------
.../current/how-to-verify.md | 6 ++--
4 files changed, 40 insertions(+), 40 deletions(-)
diff --git a/community/how-to-release.md b/community/how-to-release.md
index 506ecbe..997147a 100644
--- a/community/how-to-release.md
+++ b/community/how-to-release.md
@@ -29,7 +29,7 @@ Note: The commands of GnuPG 1.x version and 2.x version are
slightly different.
After installation, the gpg command is added to the system environment
variables and is available
```sh
#Check the version, it should be 2.x
-$ gpg --version
+gpg --version
```
### 1.2. Generate key with gpg
@@ -101,21 +101,21 @@ sub rsa4096 2021-11-10 [E]
### 1.3. Upload the generated key to the public server
```shell
-$ gpg --keyid-format SHORT --list-keys
+gpg --keyid-format SHORT --list-keys
pub rsa4096/584EE68E 2021-11-10 [SC] #584EE68E is the key id
E7A9B12D1AC2D8CF857AF5851AE82584584EE68E
uid [ultimate] mingXiao (test key for apache create at 20211110)
<[email protected]>
sub rsa4096/399AA54F 2021-11-10 [E]
# Send public key to keyserver via key id
-$ gpg --keyserver keyserver.ubuntu.com --send-key 584EE68E
+gpg --keyserver keyserver.ubuntu.com --send-key 584EE68E
# Among them, keyserver.ubuntu.com is the selected keyserver, it is
recommended to use this, because the Apache Nexus verification uses this
keyserver
```
### 1.4. Check whether the key is created successfully
Verify whether it is synchronized to the public network. It takes about a
minute to find out. If it is not successful, you can upload and retry several
times
```shell
method one
-$ gpg --keyserver keyserver.ubuntu.com --recv-keys 584EE68E #584EE68E is the
corresponding key id
+gpg --keyserver keyserver.ubuntu.com --recv-keys 584EE68E #584EE68E is the
corresponding key id
D:\>gpg --keyserver keyserver.ubuntu.com --recv-keys 584EE68E
#Results are as follows
@@ -248,10 +248,10 @@ Modify the configuration in pom.xml
Check whether the code is normal, including the version number, the
compilation is successful, the unit test is all successful, the RAT check is
successful, etc.
```
#build check
-$ mvn clean install -Dmaven.javadoc.skip=true
+mvn clean install -Dmaven.javadoc.skip=true
#RAT LICENSE check
#It can be executed within 5 minutes normally. If the execution has not ended
for a long time, please check whether additional files that need not be checked
have been added due to actions such as compiling.
-$ mvn apache-rat:check
+mvn apache-rat:check
#Check all rat files after no exception
find ./ -name rat.txt -print0 | xargs -0 -I file cat file > merged-rat.txt
@@ -439,7 +439,7 @@ svn status
svn commit -m "prepare for 1.0.3-RC1"
```
-If Chinese garbled characters appear in the svn command, you can try to set
the encoding format.
+If Chinese garbled characters appear in the svn command, you can try to set
the encoding format (set the encoding format: export LANG=en_US.UTF-8).
## 4 Verify Release Candidates
@@ -636,12 +636,12 @@ On behalf of Apache Linkis(Incubating) community
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
+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
@@ -650,12 +650,12 @@ Move the source and binary packages from the `dev`
directory of svn to the `rele
```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"
+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}"
+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
@@ -664,7 +664,7 @@ $ svn cp
https://dist.apache.org/repos/dist/dev/incubator/linkis/KEYS https://di
- 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/)
```shell
-$ svn delete
https://dist.apache.org/repos/dist/release/incubator/linkis/${last_release_version}
-m "Delete ${last_release_version}"
+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
diff --git a/community/how-to-verify.md b/community/how-to-verify.md
index ce1d3de..010cd0a 100644
--- a/community/how-to-verify.md
+++ b/community/how-to-verify.md
@@ -100,7 +100,7 @@ for i in *.tar.gz; do echo $i; sha512sum --check
$i.sha512; done
> Windows
```shell
-$ certUtil -hashfile apache-linkis-${release_version}-incubating-xxx.tar.gz
SHA512
+certUtil -hashfile apache-linkis-${release_version}-incubating-xxx.tar.gz
SHA512
#Compare the output content with the content of the
apache-linkis-${release_version}-incubating-xxx.tar.gz.sha512 file
```
@@ -117,8 +117,8 @@ cd apache-linkis-${release_version}-incubating-src
````
#normally can be executed within 5 minutes
-$ mvn -N install
-$ mvn apache-rat:check
+mvn -N install
+mvn apache-rat:check
#Check all rat files after no exception
find ./ -name rat.txt -print0 | xargs -0 -I file cat file > merged-rat.txt
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 8f73d45..d99e138 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
@@ -33,7 +33,7 @@ Apache的maven和SVN仓库都会使用到GPG签名来验证物料文件的合法
安装后gpg命令添加至系统环境变量且可用
```sh
#检查版本，应该为2.x
-$ gpg --version
+gpg --version
```
### 1.2 用gpg生成key
@@ -105,21 +105,21 @@ sub rsa4096 2021-11-10 [E]
### 1.3 上传生成的key到公共服务器
```shell
-$ gpg --keyid-format SHORT --list-keys
+gpg --keyid-format SHORT --list-keys
pub rsa4096/584EE68E 2021-11-10 [SC] #584EE68E就是key id
E7A9B12D1AC2D8CF857AF5851AE82584584EE68E
uid [ultimate] mingXiao (test key for apache create at 20211110)
<[email protected]>
sub rsa4096/399AA54F 2021-11-10 [E]
# 通过key id发送public key到keyserver
-$ gpg --keyserver keyserver.ubuntu.com --send-key 584EE68E
+gpg --keyserver keyserver.ubuntu.com --send-key 584EE68E
# 其中，keyserver.ubuntu.com为挑选的keyserver，建议使用这个, 因为Apache Nexus校验时是使用的这个keyserver
```
### 1.4 查看key是否创建成功
验证是否同步到公网，大概需要一分钟才能查到,未成功可以进行上传重试几次
```shell
方式一
-$ gpg --keyserver keyserver.ubuntu.com --recv-keys 584EE68E #584EE68E是对应的key id
+gpg --keyserver keyserver.ubuntu.com --recv-keys 584EE68E #584EE68E是对应的key id
D:\>gpg --keyserver keyserver.ubuntu.com --recv-keys 584EE68E
#结果如下
@@ -251,11 +251,11 @@ mvn versions:set -DnewVersion=1.0.3
检查代码是否正常，包括版本号，编译成功、单元测试全部成功，RAT检查成功等等
```
#build检查
-$ mvn clean install -Dmaven.javadoc.skip=true
+mvn clean install -Dmaven.javadoc.skip=true
#RAT LICENSE检查
#正常5分钟内可以执行完，如果长时间未执行结束，请检查是否由于编译等动作，增加了额外不必要检查的文件
-$ mvn apache-rat:check
+mvn apache-rat:check
#无异常后 检查所有的rat文件
find ./ -name rat.txt -print0 | xargs -0 -I file cat file > merged-rat.txt
@@ -443,7 +443,7 @@ svn status
svn commit -m "prepare for 1.0.3-RC1"
```
-若svn命令出现中文乱码，可尝试设置编码格式。
+若svn命令出现中文乱码，可尝试设置编码格式(设置编码格式:export LANG=en_US.UTF-8)。
## 4 验证Release Candidates
@@ -651,12 +651,12 @@ On behalf of Apache Linkis(Incubating) community
合并`${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
+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 迁移源码与二进制包
@@ -665,12 +665,12 @@ $ git branch -d ${release_version}-RC
```shell
#移动源码包与二进制包
-$ 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}"
# 下面操作 按实际情况 决定是否更新release 分支的key
# 清除原有release目录下的KEYS
-$ svn delete https://dist.apache.org/repos/dist/release/incubator/linkis/KEYS
-m "delete KEYS"
+svn delete https://dist.apache.org/repos/dist/release/incubator/linkis/KEYS -m
"delete KEYS"
# 拷贝dev目录KEYS到release目录
-$ 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}"
+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下的包是否正确
@@ -679,7 +679,7 @@ $ svn cp
https://dist.apache.org/repos/dist/dev/incubator/linkis/KEYS https://di
- 删除[release](https://dist.apache.org/repos/dist/release/incubator/linkis/)目录下
上一个版本的发布包，这些包会被自动保存在[这里](https://archive.apache.org/dist/incubator/linkis/)
```shell
-$ svn delete
https://dist.apache.org/repos/dist/release/incubator/linkis/${last_release_version}
-m "Delete ${last_release_version}"
+svn delete
https://dist.apache.org/repos/dist/release/incubator/linkis/${last_release_version}
-m "Delete ${last_release_version}"
```
### 6.4 在Apache Staging仓库发布版本
diff --git
a/i18n/zh-CN/docusaurus-plugin-content-docs-community/current/how-to-verify.md
b/i18n/zh-CN/docusaurus-plugin-content-docs-community/current/how-to-verify.md
index 6f5461c..0da6535 100644
---
a/i18n/zh-CN/docusaurus-plugin-content-docs-community/current/how-to-verify.md
+++
b/i18n/zh-CN/docusaurus-plugin-content-docs-community/current/how-to-verify.md
@@ -97,7 +97,7 @@ for i in *.tar.gz; do echo $i; sha512sum --check $i.sha512;
done
> Windows
```shell
-$ certUtil -hashfile apache-linkis-${release_version}-incubating-xxx.tar.gz
SHA512
+certUtil -hashfile apache-linkis-${release_version}-incubating-xxx.tar.gz
SHA512
#并将输出内容与 apache-linkis-${release_version}-incubating-xxx.tar.gz.sha512文件内容作对比
```
@@ -115,8 +115,8 @@ cd apache-linkis-${release_version}-incubating-src
```
#正常5分钟内可以执行完
-$ mvn -N install
-$ mvn apache-rat:check
+mvn -N install
+mvn apache-rat:check
#无异常后 检查所有的rat文件
find ./ -name rat.txt -print0 | xargs -0 -I file cat file > merged-rat.txt
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
