Skip to content

Commit 4e85302

Browse files
authored
[Chore] Fix publish docker error in CI due to deploy failed (#16667)
1 parent b97f6fc commit 4e85302

12 files changed

Lines changed: 9 additions & 16 deletions

File tree

‎.github/workflows/api-test.yml‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,6 @@ jobs:
8181
run: |
8282
./mvnw -B clean install \
8383
-Dmaven.test.skip=true \
84-
-Dmaven.javadoc.skip=true \
8584
-Dspotless.skip=true \
8685
-Pdocker,staging -Ddocker.tag=ci
8786
- name: Export Docker Images

‎.github/workflows/codeql.yaml‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,6 @@ jobs:
5151
- run: |
5252
./mvnw -B clean install \
5353
-Dmaven.test.skip \
54-
-Dmaven.javadoc.skip \
5554
-Dspotless.skip=true \
5655
-Prelease
5756

‎.github/workflows/e2e-k8s.yml‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,6 @@ jobs:
7171
run: |
7272
./mvnw -B clean package \
7373
-Dmaven.test.skip=true \
74-
-Dmaven.javadoc.skip=true \
7574
-Dspotless.skip=true \
7675
-Pdocker,staging -Ddocker.tag=ci
7776
- name: Create k8s Kind Cluster

‎.github/workflows/e2e.yml‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,6 @@ jobs:
8383
run: |
8484
./mvnw -B clean install \
8585
-Dmaven.test.skip=true \
86-
-Dmaven.javadoc.skip=true \
8786
-Dspotless.skip=true \
8887
-Pdocker,staging -Ddocker.tag=ci
8988
- name: Export Docker Images

‎.github/workflows/publish-docker.yaml‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,6 @@ jobs:
8585
run: |
8686
./mvnw -B clean deploy \
8787
-Dmaven.test.skip \
88-
-Dmaven.javadoc.skip \
8988
-Dspotless.skip=true \
9089
-Ddocker.tag=${{ env.DOCKER_TAG }} \
9190
-Ddocker.hub=${{ env.HUB }} \

‎.github/workflows/publish-nexus.yaml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -72,4 +72,5 @@ jobs:
7272
-s ${{ env.SETTINGS_PATH }} \
7373
-Dmaven.test.skip=true \
7474
-Dspotless.skip=true \
75+
-Dmaven.deploy.skip=false \
7576
-Pstaging

‎docs/docs/en/contribute/development-environment-setup.md‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,6 @@ DolphinScheduler will release new Docker images after it released, you could fin
6464
cd dolphinscheduler
6565
./mvnw -B clean package \
6666
-Dmaven.test.skip \
67-
-Dmaven.javadoc.skip \
6867
-Dspotless.skip = true \
6968
-Ddocker.tag=<TAG> \
7069
-Pdocker,release
@@ -78,7 +77,6 @@ When the command is finished you could find them by command `docker images`.
7877
cd dolphinscheduler
7978
./mvnw -B clean deploy \
8079
-Dmaven.test.skip \
81-
-Dmaven.javadoc.skip \
8280
-Dspotless.skip = true \
8381
-Ddocker.tag=<TAG> \
8482
-Ddocker.hub=<HUB_URL> \

‎docs/docs/en/contribute/release.md‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -225,7 +225,7 @@ git push "${GH_REMOTE}" "${VERSION}"-release
225225
> first to clone the source code. And then make sure you set `GH_REMOTE="origin"` to make all command work fine.
226226
227227
```shell
228-
mvn release:prepare -Prelease -Darguments="-Dmaven.test.skip=true -Dspotless.skip=true -Dmaven.javadoc.skip=true -Dspotless.check.skip=true" -DautoVersionSubmodules=true -DdryRun=true -Dusername="${GH_USERNAME}"
228+
mvn release:prepare -Prelease -Darguments="-Dmaven.test.skip=true -Dspotless.skip=true -Dspotless.check.skip=true" -DautoVersionSubmodules=true -DdryRun=true -Dusername="${GH_USERNAME}"
229229
```
230230
231231
- `-Prelease`: choose release profile, which will pack all the source codes, jar files and executable binary packages.
@@ -243,7 +243,7 @@ mvn release:clean
243243
Then, prepare to execute the release.
244244
245245
```shell
246-
mvn release:prepare -Prelease -Darguments="-Dmaven.test.skip=true -Dspotless.skip=true -Dmaven.javadoc.skip=true -Dspotless.check.skip=true" -DautoVersionSubmodules=true -DpushChanges=false -Dusername="${GH_USERNAME}"
246+
mvn release:prepare -Prelease -Darguments="-Dmaven.test.skip=true -Dspotless.skip=true -Dspotless.check.skip=true" -DautoVersionSubmodules=true -DpushChanges=false -Dusername="${GH_USERNAME}"
247247
```
248248
249249
It is basically the same as the previous rehearsal command, but deleting `-DdryRun=true` parameter.
@@ -275,7 +275,7 @@ git push "${GH_REMOTE}" --tags
275275
#### Maven Release Deploy
276276
277277
```shell
278-
mvn release:perform -Prelease -Darguments="-Dmaven.test.skip=true -Dspotless.skip=true -Dmaven.javadoc.skip=true -Dspotless.check.skip=true" -DautoVersionSubmodules=true -Dusername="${GH_USERNAME}"
278+
mvn release:perform -Prelease -Darguments="-Dmaven.test.skip=true -Dspotless.skip=true -Dspotless.check.skip=true" -DautoVersionSubmodules=true -Dusername="${GH_USERNAME}"
279279
```
280280
281281
After that command is executed, the version to be released will be uploaded to Apache staging repository automatically.

‎docs/docs/zh/contribute/development-environment-setup.md‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,6 @@ DolphinScheduler 每次发版都会同时发布 Docker 镜像,你可以在 [Do
6161
cd dolphinscheduler
6262
./mvnw -B clean package \
6363
-Dmaven.test.skip \
64-
-Dmaven.javadoc.skip \
6564
-Dspotless.skip=true \
6665
-Ddocker.tag=<TAG> \
6766
-Pdocker,release
@@ -75,7 +74,6 @@ cd dolphinscheduler
7574
cd dolphinscheduler
7675
./mvnw -B clean deploy \
7776
-Dmaven.test.skip \
78-
-Dmaven.javadoc.skip \
7977
-Dspotless.skip = true \
8078
-Ddocker.tag=<TAG> \
8179
-Ddocker.hub=<HUB_URL> \

‎docs/docs/zh/contribute/release.md‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -232,7 +232,7 @@ git push "${GH_REMOTE}" "${VERSION}"-release
232232
233233
```shell
234234
# 运行发版校验
235-
mvn release:prepare -Prelease -Darguments="-Dmaven.test.skip=true -Dspotless.skip=true -Dmaven.javadoc.skip=true -Dspotless.check.skip=true" -DautoVersionSubmodules=true -DdryRun=true -Dusername="${GH_USERNAME}"
235+
mvn release:prepare -Prelease -Darguments="-Dmaven.test.skip=true -Dspotless.skip=true -Dspotless.check.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 -Dmaven.javadoc.skip=true -Dspotless.check.skip=true" -DautoVersionSubmodules=true -DpushChanges=false -Dusername="${GH_USERNAME}"
253+
mvn release:prepare -Prelease -Darguments="-Dmaven.test.skip=true -Dspotless.skip=true -Dspotless.check.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 -Dmaven.javadoc.skip=true -Dspotless.check.skip=true" -DautoVersionSubmodules=true -Dusername="${GH_USERNAME}"
282+
mvn release:perform -Prelease -Darguments="-Dmaven.test.skip=true -Dspotless.skip=true -Dspotless.check.skip=true" -DautoVersionSubmodules=true -Dusername="${GH_USERNAME}"
283283
```
284284
285285
执行完该命令后,待发布版本会自动上传到 Apache 的临时筹备仓库(staging repository)。你可以通过访问 [apache staging repositories](https://repository.apache.org/#stagingRepositories)

0 commit comments

Comments
 (0)