From d3d9619738c5d7a554c509d0e36e55f1218bcee9 Mon Sep 17 00:00:00 2001
From: Jave-Chen <acc4hf@126.com>
Date: Mon, 6 Jan 2020 10:36:44 +0800
Subject: [PATCH] Fix sonarcloud analysis on merge PR (#1707)

* #1706 fix sonarcloud analysis on merge PR

* sonarcloud use cobertura report and don't run UT again; include ui source file; merge to one workflow
---
 .github/workflows/ci_ut.yml | 11 ++++++-----
 dolphinscheduler-ui/pom.xml |  1 +
 pom.xml                     |  1 +
 3 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/ci_ut.yml b/.github/workflows/ci_ut.yml
index 152d7ee8c..a0b7d2427 100644
--- a/.github/workflows/ci_ut.yml
+++ b/.github/workflows/ci_ut.yml
@@ -15,7 +15,7 @@
 # limitations under the License.
 #
 
-on: ["pull_request"]
+on: [push, "pull_request"]
 env:
   DOCKER_DIR: ./docker
   LOG_DIR: /tmp/dolphinscheduler
@@ -49,11 +49,12 @@ jobs:
           export MAVEN_OPTS='-Dmaven.repo.local=.m2/repository -XX:+TieredCompilation -XX:TieredStopAtLevel=1 -XX:+CMSClassUnloadingEnabled -XX:+UseConcMarkSweepGC -XX:-UseGCOverheadLimit -Xmx3g'
           mvn test -Dmaven.test.skip=false cobertura:cobertura
           CODECOV_TOKEN="09c2663f-b091-4258-8a47-c981827eb29a" bash <(curl -s https://codecov.io/bash)
-      - name: Run SonarCloud analysis
+      - name: Run SonarCloud Analysis
         run: >
-          mvn clean --batch-mode
-          verify
-          org.sonarsource.scanner.maven:sonar-maven-plugin:3.6.1.1688:sonar 
+          mvn verify --batch-mode
+          org.sonarsource.scanner.maven:sonar-maven-plugin:3.6.1.1688:sonar
+          -Dsonar.junit.reportPaths=target/cobertura
+          -Dmaven.test.skip=true
           -Dsonar.host.url=https://sonarcloud.io
           -Dsonar.organization=apache
           -Dsonar.projectKey=apache-dolphinscheduler
diff --git a/dolphinscheduler-ui/pom.xml b/dolphinscheduler-ui/pom.xml
index 28f584f49..3fd9aa665 100644
--- a/dolphinscheduler-ui/pom.xml
+++ b/dolphinscheduler-ui/pom.xml
@@ -31,6 +31,7 @@
   <properties>
     <node.version>v12.12.0</node.version>
     <npm.version>6.11.3</npm.version>
+    <sonar.sources>src</sonar.sources>
   </properties>
   <profiles>
     <profile>
diff --git a/pom.xml b/pom.xml
index a0f5bcba6..2f1727f3c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -810,6 +810,7 @@
 					<check>
 					</check>
 					<aggregate>true</aggregate>
+					<outputDirectory>./target/cobertura</outputDirectory>
 					<encoding>${project.build.sourceEncoding}</encoding>
 					<quiet>true</quiet>
 					<format>xml</format>
-- 
GitLab