This is an automated email from the ASF dual-hosted git repository.
kerwin pushed a commit to branch 3.1.2-prepare
in repository https://gitbox.apache.org/repos/asf/dolphinscheduler.git
The following commit(s) were added to refs/heads/3.1.2-prepare by this push:
new 0512e7696f cherry-pick [doc] Add skip spotless check during ASF
release #12835
0512e7696f is described below
commit 0512e7696f1cd7b5390fe9de57d464d51f1a66f5
Author: Kerwin <[email protected]>
AuthorDate: Thu Nov 10 14:26:24 2022 +0800
cherry-pick [doc] Add skip spotless check during ASF release
#12835
---
docs/docs/en/contribute/release/release.md | 10 +++++-----
docs/docs/zh/contribute/release/release.md | 12 +++++-------
2 files changed, 10 insertions(+), 12 deletions(-)
diff --git a/docs/docs/en/contribute/release/release.md
b/docs/docs/en/contribute/release/release.md
index 2b21c342cf..a882f1fab8 100644
--- a/docs/docs/en/contribute/release/release.md
+++ b/docs/docs/en/contribute/release/release.md
@@ -166,10 +166,8 @@ git push origin "${VERSION}"-release
### Pre-Release Check
```shell
-# make gpg command could be run in maven correct
-export GPG_TTY=$(tty)
-mvn release:prepare -Prelease,python -Darguments="-Dmaven.test.skip=true
-Dcheckstyle.skip=true -Dmaven.javadoc.skip=true" -DautoVersionSubmodules=true
-DdryRun=true -Dusername="${GH_USERNAME}"
+mvn release:prepare -Prelease,python -Darguments="-Dmaven.test.skip=true
-Dcheckstyle.skip=true -Dmaven.javadoc.skip=true -Dspotless.check.skip=true"
-DautoVersionSubmodules=true -DdryRun=true -Dusername="${GH_USERNAME}"
```
* `-Prelease,python`: choose release and python profile, which will pack all
the source codes, jar files and executable binary packages, and Python
distribute package.
@@ -187,7 +185,8 @@ mvn release:clean
Then, prepare to execute the release.
```shell
-mvn release:prepare -Prelease,python -Darguments="-Dmaven.test.skip=true
-Dcheckstyle.skip=true -Dmaven.javadoc.skip=true" -DautoVersionSubmodules=true
-DpushChanges=false -Dusername="${GH_USERNAME}"
+
+mvn release:prepare -Prelease,python -Darguments="-Dmaven.test.skip=true
-Dcheckstyle.skip=true -Dmaven.javadoc.skip=true -Dspotless.check.skip=true"
-DautoVersionSubmodules=true -DpushChanges=false -Dusername="${GH_USERNAME}"
```
It is basically the same as the previous rehearsal command, but deleting
`-DdryRun=true` parameter.
@@ -219,7 +218,8 @@ git push origin --tags
### Deploy the Release
```shell
-mvn release:perform -Prelease,python -Darguments="-Dmaven.test.skip=true
-Dcheckstyle.skip=true -Dmaven.javadoc.skip=true" -DautoVersionSubmodules=true
-Dusername="${GH_USERNAME}"
+<<<<<<< HEAD
+mvn release:perform -Prelease,python -Darguments="-Dmaven.test.skip=true
-Dcheckstyle.skip=true -Dmaven.javadoc.skip=true -Dspotless.check.skip=true"
-DautoVersionSubmodules=true -Dusername="${GH_USERNAME}"
```
After that command is executed, the version to be released will be uploaded to
Apache staging repository automatically.
diff --git a/docs/docs/zh/contribute/release/release.md
b/docs/docs/zh/contribute/release/release.md
index 8a50b12c2c..7d2fc71048 100644
--- a/docs/docs/zh/contribute/release/release.md
+++ b/docs/docs/zh/contribute/release/release.md
@@ -165,18 +165,16 @@ A_USERNAME=<YOUR-APACHE-USERNAME>
git clone -b "${VERSION}"-prepare
https://github.com/apache/dolphinscheduler.git
cd ~/dolphinscheduler/
git pull
-git checkout -b ${RELEASE.VERSION}-release
-git push origin ${RELEASE.VERSION}-release
+git checkout -b "${VERSION}"-release
+git push origin "${VERSION}"-release
```
### 发布预校验
```shell
-# 保证 python profile 的 gpg 可以正常运行
-export GPG_TTY=$(tty)
# 运行发版校验
-mvn release:prepare -Prelease,python -Darguments="-Dmaven.test.skip=true
-Dcheckstyle.skip=true -Dmaven.javadoc.skip=true" -DautoVersionSubmodules=true
-DdryRun=true -Dusername="${GH_USERNAME}"
+mvn release:prepare -Prelease,python -Darguments="-Dmaven.test.skip=true
-Dcheckstyle.skip=true -Dmaven.javadoc.skip=true -Dspotless.check.skip=true"
-DautoVersionSubmodules=true -DdryRun=true -Dusername="${GH_USERNAME}"
```
* `-Prelease,python`:
选择release和python的profile，这个profile会打包所有源码、jar文件以及可执行二进制包，以及Python的二进制包。
@@ -194,7 +192,7 @@ mvn release:clean
然后准备执行发布。
```shell
-mvn release:prepare -Prelease,python -Darguments="-Dmaven.test.skip=true
-Dcheckstyle.skip=true -Dmaven.javadoc.skip=true" -DautoVersionSubmodules=true
-DpushChanges=false -Dusername="${GH_USERNAME}"
+mvn release:prepare -Prelease,python -Darguments="-Dmaven.test.skip=true
-Dcheckstyle.skip=true -Dmaven.javadoc.skip=true -Dspotless.check.skip=true"
-DautoVersionSubmodules=true -DpushChanges=false -Dusername="${GH_USERNAME}"
```
和上一步演练的命令基本相同，去掉了 `-DdryRun=true` 参数。
@@ -223,7 +221,7 @@ git push origin --tags
### 部署发布
```shell
-mvn release:perform -Prelease,python -Darguments="-Dmaven.test.skip=true
-Dcheckstyle.skip=true -Dmaven.javadoc.skip=true" -DautoVersionSubmodules=true
-Dusername="${GH_USERNAME}"
+mvn release:perform -Prelease,python -Darguments="-Dmaven.test.skip=true
-Dcheckstyle.skip=true -Dmaven.javadoc.skip=true -Dspotless.check.skip=true"
-DautoVersionSubmodules=true -Dusername="${GH_USERNAME}"
```
执行完该命令后，待发布版本会自动上传到Apache的临时筹备仓库(staging repository)。你可以通过访问 [apache staging
repositories](https://repository.apache.org/#stagingRepositories)
