Browse Source

chore: Add new step skip for ui build and spotless (#14427)

3.2.1-prepare
Jay Chung 2 years ago committed by GitHub
parent
commit
0f190ae3da
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 4
      .github/workflows/api-test.yml
  2. 2
      .github/workflows/backend.yml
  3. 2
      .github/workflows/e2e.yml
  4. 2
      .github/workflows/owasp-dependency-check.yaml
  5. 2
      .github/workflows/publish-docker.yaml
  6. 4
      .github/workflows/unit-test.yml
  7. 4
      docs/docs/en/contribute/development-environment-setup.md
  8. 6
      docs/docs/en/contribute/release.md
  9. 4
      docs/docs/zh/contribute/development-environment-setup.md
  10. 6
      docs/docs/zh/contribute/release.md
  11. 1
      dolphinscheduler-ui/pom.xml
  12. 3
      pom.xml

4
.github/workflows/api-test.yml

@ -67,7 +67,7 @@ jobs:
./mvnw -B clean install \ ./mvnw -B clean install \
-Dmaven.test.skip \ -Dmaven.test.skip \
-Dmaven.javadoc.skip \ -Dmaven.javadoc.skip \
-Dcheckstyle.skip=true \ -Dspotless.skip=true \
-Pdocker,release -Ddocker.tag=ci \ -Pdocker,release -Ddocker.tag=ci \
-pl dolphinscheduler-standalone-server -am -pl dolphinscheduler-standalone-server -am
- name: Export Docker Images - name: Export Docker Images
@ -118,7 +118,7 @@ jobs:
run: | run: |
./mvnw -B -f dolphinscheduler-api-test/pom.xml -am \ ./mvnw -B -f dolphinscheduler-api-test/pom.xml -am \
-DfailIfNoTests=false \ -DfailIfNoTests=false \
-Dcheckstyle.skip=false \ -Dspotless.skip=false \
-Dtest=${{ matrix.case.class }} test -Dtest=${{ matrix.case.class }} test
- uses: actions/upload-artifact@v2 - uses: actions/upload-artifact@v2
if: always() if: always()

2
.github/workflows/backend.yml

@ -81,7 +81,7 @@ jobs:
./mvnw -B clean install \ ./mvnw -B clean install \
-Prelease,docker \ -Prelease,docker \
-Dmaven.test.skip=true \ -Dmaven.test.skip=true \
-Dcheckstyle.skip=true \ -Dspotless.skip=true \
-Dhttp.keepAlive=false \ -Dhttp.keepAlive=false \
-Dmaven.wagon.http.pool=false \ -Dmaven.wagon.http.pool=false \
-Dmaven.wagon.httpconnectionManager.ttlSeconds=120 -Dmaven.wagon.httpconnectionManager.ttlSeconds=120

2
.github/workflows/e2e.yml

@ -67,7 +67,7 @@ jobs:
./mvnw -B clean install \ ./mvnw -B clean install \
-Dmaven.test.skip \ -Dmaven.test.skip \
-Dmaven.javadoc.skip \ -Dmaven.javadoc.skip \
-Dcheckstyle.skip=true \ -Dspotless.skip=true \
-Pdocker,release -Ddocker.tag=ci \ -Pdocker,release -Ddocker.tag=ci \
-pl dolphinscheduler-standalone-server -am -pl dolphinscheduler-standalone-server -am
- name: Export Docker Images - name: Export Docker Images

2
.github/workflows/owasp-dependency-check.yaml

@ -40,7 +40,7 @@ jobs:
java-version: 8 java-version: 8
distribution: 'adopt' distribution: 'adopt'
- name: Run OWASP Dependency Check - name: Run OWASP Dependency Check
run: ./mvnw -B clean install verify dependency-check:check -DskipDepCheck=false -Dmaven.test.skip=true -Dcheckstyle.skip=true run: ./mvnw -B clean install verify dependency-check:check -DskipDepCheck=false -Dmaven.test.skip=true -Dspotless.skip=true
- name: Upload report - name: Upload report
uses: actions/upload-artifact@v3 uses: actions/upload-artifact@v3
if: ${{ cancelled() || failure() }} if: ${{ cancelled() || failure() }}

2
.github/workflows/publish-docker.yaml

@ -71,7 +71,7 @@ jobs:
./mvnw -B clean deploy \ ./mvnw -B clean deploy \
-Dmaven.test.skip \ -Dmaven.test.skip \
-Dmaven.javadoc.skip \ -Dmaven.javadoc.skip \
-Dcheckstyle.skip=true \ -Dspotless.skip=true \
-Dmaven.deploy.skip \ -Dmaven.deploy.skip \
-Ddocker.tag=${{ env.DOCKER_TAG }} \ -Ddocker.tag=${{ env.DOCKER_TAG }} \
-Ddocker.hub=${{ env.HUB }} \ -Ddocker.hub=${{ env.HUB }} \

4
.github/workflows/unit-test.yml

@ -75,7 +75,7 @@ jobs:
key: ${{ runner.os }}-maven key: ${{ runner.os }}-maven
- name: Run Unit tests - name: Run Unit tests
run: ./mvnw clean verify -B -Dmaven.test.skip=false -Dcheckstyle.skip=true run: ./mvnw clean verify -B -Dmaven.test.skip=false -Dspotless.skip=true
- name: Upload coverage report to codecov - name: Upload coverage report to codecov
run: CODECOV_TOKEN="09c2663f-b091-4258-8a47-c981827eb29a" bash <(curl -s https://codecov.io/bash) run: CODECOV_TOKEN="09c2663f-b091-4258-8a47-c981827eb29a" bash <(curl -s https://codecov.io/bash)
@ -90,7 +90,7 @@ jobs:
./mvnw --batch-mode verify sonar:sonar ./mvnw --batch-mode verify sonar:sonar
-Dsonar.coverage.jacoco.xmlReportPaths=target/site/jacoco/jacoco.xml -Dsonar.coverage.jacoco.xmlReportPaths=target/site/jacoco/jacoco.xml
-Dmaven.test.skip=true -Dmaven.test.skip=true
-Dcheckstyle.skip=true -Dspotless.skip=true
-Dsonar.host.url=https://sonarcloud.io -Dsonar.host.url=https://sonarcloud.io
-Dsonar.organization=apache -Dsonar.organization=apache
-Dsonar.core.codeCoveragePlugin=jacoco -Dsonar.core.codeCoveragePlugin=jacoco

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

@ -65,7 +65,7 @@ cd dolphinscheduler
./mvnw -B clean package \ ./mvnw -B clean package \
-Dmaven.test.skip \ -Dmaven.test.skip \
-Dmaven.javadoc.skip \ -Dmaven.javadoc.skip \
-Dmaven.checkstyle.skip \ -Dspotless.skip = true \
-Ddocker.tag=<TAG> \ -Ddocker.tag=<TAG> \
-Pdocker,release -Pdocker,release
``` ```
@ -79,7 +79,7 @@ cd dolphinscheduler
./mvnw -B clean deploy \ ./mvnw -B clean deploy \
-Dmaven.test.skip \ -Dmaven.test.skip \
-Dmaven.javadoc.skip \ -Dmaven.javadoc.skip \
-Dmaven.checkstyle.skip \ -Dspotless.skip = true \
-Dmaven.deploy.skip \ -Dmaven.deploy.skip \
-Ddocker.tag=<TAG> \ -Ddocker.tag=<TAG> \
-Ddocker.hub=<HUB_URL> \ -Ddocker.hub=<HUB_URL> \

6
docs/docs/en/contribute/release.md

@ -208,7 +208,7 @@ git push "${GH_REMOTE}" "${VERSION}"-release
> first to clone the source code. And then make sure you set `GH_REMOTE="origin"` to make all command work fine. > first to clone the source code. And then make sure you set `GH_REMOTE="origin"` to make all command work fine.
```shell ```shell
mvn release:prepare -Prelease -Darguments="-Dmaven.test.skip=true -Dcheckstyle.skip=true -Dmaven.javadoc.skip=true -Dspotless.check.skip=true" -DautoVersionSubmodules=true -DdryRun=true -Dusername="${GH_USERNAME}" 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}"
``` ```
- `-Prelease`: choose release profile, which will pack all the source codes, jar files and executable binary packages. - `-Prelease`: choose release profile, which will pack all the source codes, jar files and executable binary packages.
@ -226,7 +226,7 @@ mvn release:clean
Then, prepare to execute the release. Then, prepare to execute the release.
```shell ```shell
mvn release:prepare -Prelease -Darguments="-Dmaven.test.skip=true -Dcheckstyle.skip=true -Dmaven.javadoc.skip=true -Dspotless.check.skip=true" -DautoVersionSubmodules=true -DpushChanges=false -Dusername="${GH_USERNAME}" 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}"
``` ```
It is basically the same as the previous rehearsal command, but deleting `-DdryRun=true` parameter. It is basically the same as the previous rehearsal command, but deleting `-DdryRun=true` parameter.
@ -258,7 +258,7 @@ git push "${GH_REMOTE}" --tags
#### Maven Release Deploy #### Maven Release Deploy
```shell ```shell
mvn release:perform -Prelease -Darguments="-Dmaven.test.skip=true -Dcheckstyle.skip=true -Dmaven.javadoc.skip=true -Dspotless.check.skip=true" -DautoVersionSubmodules=true -Dusername="${GH_USERNAME}" 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}"
``` ```
After that command is executed, the version to be released will be uploaded to Apache staging repository automatically. After that command is executed, the version to be released will be uploaded to Apache staging repository automatically.

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

@ -62,7 +62,7 @@ cd dolphinscheduler
./mvnw -B clean package \ ./mvnw -B clean package \
-Dmaven.test.skip \ -Dmaven.test.skip \
-Dmaven.javadoc.skip \ -Dmaven.javadoc.skip \
-Dmaven.checkstyle.skip \ -Dspotless.skip=true \
-Ddocker.tag=<TAG> \ -Ddocker.tag=<TAG> \
-Pdocker,release -Pdocker,release
``` ```
@ -76,7 +76,7 @@ cd dolphinscheduler
./mvnw -B clean deploy \ ./mvnw -B clean deploy \
-Dmaven.test.skip \ -Dmaven.test.skip \
-Dmaven.javadoc.skip \ -Dmaven.javadoc.skip \
-Dmaven.checkstyle.skip \ -Dspotless.skip = true \
-Dmaven.deploy.skip \ -Dmaven.deploy.skip \
-Ddocker.tag=<TAG> \ -Ddocker.tag=<TAG> \
-Ddocker.hub=<HUB_URL> \ -Ddocker.hub=<HUB_URL> \

6
docs/docs/zh/contribute/release.md

@ -215,7 +215,7 @@ git push "${GH_REMOTE}" "${VERSION}"-release
```shell ```shell
# 运行发版校验 # 运行发版校验
mvn release:prepare -Prelease -Darguments="-Dmaven.test.skip=true -Dcheckstyle.skip=true -Dmaven.javadoc.skip=true -Dspotless.check.skip=true" -DautoVersionSubmodules=true -DdryRun=true -Dusername="${GH_USERNAME}" 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}"
``` ```
- `-Prelease`: 选择 release 的 profile,这个 profile 会打包所有源码、jar 文件以及可执行二进制包。 - `-Prelease`: 选择 release 的 profile,这个 profile 会打包所有源码、jar 文件以及可执行二进制包。
@ -233,7 +233,7 @@ mvn release:clean
然后准备执行发布。 然后准备执行发布。
```shell ```shell
mvn release:prepare -Prelease -Darguments="-Dmaven.test.skip=true -Dcheckstyle.skip=true -Dmaven.javadoc.skip=true -Dspotless.check.skip=true" -DautoVersionSubmodules=true -DpushChanges=false -Dusername="${GH_USERNAME}" 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}"
``` ```
和上一步演练的命令基本相同,去掉了 `-DdryRun=true` 参数。 和上一步演练的命令基本相同,去掉了 `-DdryRun=true` 参数。
@ -262,7 +262,7 @@ git push "${GH_REMOTE}" --tags
#### 部署发布 #### 部署发布
```shell ```shell
mvn release:perform -Prelease -Darguments="-Dmaven.test.skip=true -Dcheckstyle.skip=true -Dmaven.javadoc.skip=true -Dspotless.check.skip=true" -DautoVersionSubmodules=true -Dusername="${GH_USERNAME}" 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}"
``` ```
执行完该命令后,待发布版本会自动上传到 Apache 的临时筹备仓库(staging repository)。你可以通过访问 [apache staging repositories](https://repository.apache.org/#stagingRepositories) 执行完该命令后,待发布版本会自动上传到 Apache 的临时筹备仓库(staging repository)。你可以通过访问 [apache staging repositories](https://repository.apache.org/#stagingRepositories)

1
dolphinscheduler-ui/pom.xml

@ -45,6 +45,7 @@
<artifactId>frontend-maven-plugin</artifactId> <artifactId>frontend-maven-plugin</artifactId>
<version>${frontend-maven-plugin.version}</version> <version>${frontend-maven-plugin.version}</version>
<configuration> <configuration>
<skip>${build.ui.skip}</skip>
<pnpmInheritsProxyConfigFromMaven>false</pnpmInheritsProxyConfigFromMaven> <pnpmInheritsProxyConfigFromMaven>false</pnpmInheritsProxyConfigFromMaven>
</configuration> </configuration>
<executions> <executions>

3
pom.xml

@ -92,6 +92,8 @@
<docker.build.skip>true</docker.build.skip> <docker.build.skip>true</docker.build.skip>
<docker.push.skip>true</docker.push.skip> <docker.push.skip>true</docker.push.skip>
<skipDepCheck>true</skipDepCheck> <skipDepCheck>true</skipDepCheck>
<build.ui.skip>false</build.ui.skip>
<spotless.skip>false</spotless.skip>
</properties> </properties>
<dependencyManagement> <dependencyManagement>
@ -604,6 +606,7 @@
<artifactId>spotless-maven-plugin</artifactId> <artifactId>spotless-maven-plugin</artifactId>
<version>${spotless.version}</version> <version>${spotless.version}</version>
<configuration> <configuration>
<skip>${spotless.skip}</skip>
<java> <java>
<eclipse> <eclipse>
<file>style/spotless_dolphinscheduler_formatter.xml</file> <file>style/spotless_dolphinscheduler_formatter.xml</file>

Loading…
Cancel
Save