Skip to content

Commit 46485a4

Browse files
authored
fix release process (#17095)
1 parent 6a05a9e commit 46485a4

6 files changed

Lines changed: 11 additions & 162 deletions

File tree

.github/workflows/publish-nexus.yaml

Lines changed: 0 additions & 76 deletions
This file was deleted.

.github/workflows/publish-nexus/release-asf-settings.xml

Lines changed: 0 additions & 34 deletions
This file was deleted.

.github/workflows/publish-nexus/snapshot-asf-settings.xml

Lines changed: 0 additions & 29 deletions
This file was deleted.

docs/docs/en/contribute/release.md

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -219,13 +219,14 @@ Create release branch base on prepare branch.
219219
cd "${SOURCE_CODE_DIR}"
220220
git checkout -b "${VERSION}"-release "${VERSION}"-prepare
221221
git push "${GH_REMOTE}" "${VERSION}"-release
222+
export GPG_TTY=$(tty)
222223
```
223224
224225
> Note: If you release in remote host without source code, you should run `git clone -b "${VERSION}"-prepare https://github.com/apache/dolphinscheduler.git`
225226
> first to clone the source code. And then make sure you set `GH_REMOTE="origin"` to make all command work fine.
226227
227228
```shell
228-
mvn release:prepare -Prelease -Darguments="-Dmaven.test.skip=true -Dspotless.skip=true -Dspotless.check.skip=true" -DautoVersionSubmodules=true -DdryRun=true -Dusername="${GH_USERNAME}"
229+
mvn release:prepare -Papache-release,release -Darguments="-Dmaven.test.skip=true -Dspotless.skip=true -Dspotless.check.skip=true -Dmaven.javadoc.skip=true" -DautoVersionSubmodules=true -DdryRun=true -Dusername="${GH_USERNAME}"
229230
```
230231
231232
- `-Prelease`: choose release profile, which will pack all the source codes, jar files and executable binary packages.
@@ -243,7 +244,7 @@ mvn release:clean
243244
Then, prepare to execute the release.
244245
245246
```shell
246-
mvn release:prepare -Prelease -Darguments="-Dmaven.test.skip=true -Dspotless.skip=true -Dspotless.check.skip=true" -DautoVersionSubmodules=true -DpushChanges=false -Dusername="${GH_USERNAME}"
247+
mvn release:prepare -Papache-release,release -Darguments="-Dmaven.test.skip=true -Dspotless.skip=true -Dspotless.check.skip=true -Dmaven.javadoc.skip=true" -DautoVersionSubmodules=true -DpushChanges=false -Dusername="${GH_USERNAME}"
247248
```
248249
249250
It is basically the same as the previous rehearsal command, but deleting `-DdryRun=true` parameter.
@@ -275,7 +276,7 @@ git push "${GH_REMOTE}" --tags
275276
#### Maven Release Deploy
276277
277278
```shell
278-
mvn release:perform -Prelease -Darguments="-Dmaven.test.skip=true -Dspotless.skip=true -Dspotless.check.skip=true" -DautoVersionSubmodules=true -Dusername="${GH_USERNAME}"
279+
mvn release:perform -Papache-release,release -Darguments="-Dmaven.test.skip=true -Dspotless.skip=true -Dspotless.check.skip=true -Dmaven.javadoc.skip=true -Dmaven.deploy.skip=false" -DautoVersionSubmodules=true -Dusername="${GH_USERNAME}"
279280
```
280281
281282
After that command is executed, the version to be released will be uploaded to Apache staging repository automatically.

docs/docs/zh/contribute/release.md

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -123,14 +123,13 @@ sub rsa4096 2023-07-01 [E]
123123
命令如下:
124124
125125
```shell
126-
gpg --keyserver hkp://pool.sks-keyservers.net --send-key 85E11560
126+
gpg --keyserver hkp://keyserver.ubuntu.com --send-key 85E11560
127127
```
128128
129-
`pool.sks-keyservers.net`为随意挑选的[公钥服务器](https://sks-keyservers.net/status/),每个服务器之间是自动同步的,选任意一个即可。
129+
`keyserver.ubuntu.com`为随意挑选的[公钥服务器](https://keyserver.ubuntu.com),每个服务器之间是自动同步的,选任意一个即可。
130130
131131
注意:如果同步到公钥服务器,可以在服务器上查到新建的公钥
132-
http://keyserver.ubuntu.com:11371/pks/lookup?search=${用户名}&fingerprint=on&op=index
133-
备用公钥服务器 gpg --keyserver hkp://keyserver.ubuntu.com --send-key ${公钥 ID}
132+
http://keyserver.ubuntu.com/pks/lookup?search=${用户名}&fingerprint=on&op=index
134133
135134
### 配置 Apache Maven Central Repository
136135
@@ -225,14 +224,15 @@ SVN_DIR=<PATH-TO-SVN-ROOT> # to keep binary package checkout from SVN, the sub
225224
cd "${SOURCE_CODE_DIR}"
226225
git checkout -b "${VERSION}"-release "${VERSION}"-prepare
227226
git push "${GH_REMOTE}" "${VERSION}"-release
227+
export GPG_TTY=$(tty)
228228
```
229229
230230
> 注意:如果你在没有源代码的远程主机上发布,你应该先运行 `git clone -b "${VERSION}"-prepare https://github.com/apache/dolphinscheduler.git`
231231
> 首先要克隆源代码。 然后确保设置`GH_REMOTE="origin"` 以使所有命令正常工作。
232232
233233
```shell
234234
# 运行发版校验
235-
mvn release:prepare -Prelease -Darguments="-Dmaven.test.skip=true -Dspotless.skip=true -Dspotless.check.skip=true" -DautoVersionSubmodules=true -DdryRun=true -Dusername="${GH_USERNAME}"
235+
mvn release:prepare -Papache-release,release -Darguments="-Dmaven.test.skip=true -Dspotless.skip=true -Dspotless.check.skip=true -Dmaven.javadoc.skip=true" -DautoVersionSubmodules=true -DdryRun=true -Dusername="${GH_USERNAME}"
236236
```
237237
238238
- `-Prelease`: 选择 release 的 profile,这个 profile 会打包所有源码、jar 文件以及可执行二进制包。
@@ -250,7 +250,7 @@ mvn release:clean
250250
然后准备执行发布。
251251
252252
```shell
253-
mvn release:prepare -Prelease -Darguments="-Dmaven.test.skip=true -Dspotless.skip=true -Dspotless.check.skip=true" -DautoVersionSubmodules=true -DpushChanges=false -Dusername="${GH_USERNAME}"
253+
mvn release:prepare -Papache-release,release -Darguments="-Dmaven.test.skip=true -Dspotless.skip=true -Dspotless.check.skip=true -Dmaven.javadoc.skip=true" -DautoVersionSubmodules=true -DpushChanges=false -Dusername="${GH_USERNAME}"
254254
```
255255
256256
和上一步演练的命令基本相同,去掉了 `-DdryRun=true` 参数。
@@ -279,7 +279,7 @@ git push "${GH_REMOTE}" --tags
279279
#### 部署发布
280280
281281
```shell
282-
mvn release:perform -Prelease -Darguments="-Dmaven.test.skip=true -Dspotless.skip=true -Dspotless.check.skip=true" -DautoVersionSubmodules=true -Dusername="${GH_USERNAME}"
282+
mvn release:perform -Papache-release,release -Darguments="-Dmaven.test.skip=true -Dspotless.skip=true -Dspotless.check.skip=true -Dmaven.javadoc.skip=true -Dmaven.deploy.skip=false" -DautoVersionSubmodules=true -Dusername="${GH_USERNAME}"
283283
```
284284
285285
执行完该命令后,待发布版本会自动上传到 Apache 的临时筹备仓库(staging repository)。你可以通过访问 [apache staging repositories](https://repository.apache.org/#stagingRepositories)

pom.xml

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -820,19 +820,6 @@
820820
<tag>HEAD</tag>
821821
</scm>
822822

823-
<distributionManagement>
824-
<repository>
825-
<id>apache.releases.https</id>
826-
<name>Apache Release Distribution Repository</name>
827-
<url>https://repository.apache.org/service/local/staging/deploy/maven2</url>
828-
</repository>
829-
<snapshotRepository>
830-
<id>apache.snapshots.https</id>
831-
<name>Apache Development Snapshot Repository</name>
832-
<url>https://repository.apache.org/content/repositories/snapshots</url>
833-
</snapshotRepository>
834-
</distributionManagement>
835-
836823
<profiles>
837824
<profile>
838825
<id>release</id>

0 commit comments

Comments
 (0)