From a51242d445cfcc00086235f8e6b202c4c8577ebe Mon Sep 17 00:00:00 2001
From: Jave-Chen <acc4hf@126.com>
Date: Mon, 30 Dec 2019 21:21:39 +0800
Subject: [PATCH] Merge ut sonarcloud into one file (#1647)

* merge ut and sonarcloud to one action
turn on sonarcloud ut

* fix error

* test in github
---
 .github/workflows/SonarCloud.yml | 51 --------------------------------
 .github/workflows/ci_ut.yml      | 13 ++++++++
 2 files changed, 13 insertions(+), 51 deletions(-)
 delete mode 100644 .github/workflows/SonarCloud.yml

diff --git a/.github/workflows/SonarCloud.yml b/.github/workflows/SonarCloud.yml
deleted file mode 100644
index fd5b0585d..000000000
--- a/.github/workflows/SonarCloud.yml
+++ /dev/null
@@ -1,51 +0,0 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements.  See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to You under the Apache License, Version 2.0
-# (the "License"); you may not use this file except in compliance with
-# the License.  You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-name: SonarCloud
-on: [push, pull_request]
-jobs:
-  sonarCloudTrigger:
-    name: SonarCloud Trigger
-    runs-on: ubuntu-latest
-    steps:
-    - uses: actions/checkout@v1
-    - uses: actions/setup-java@v1
-      with:
-        java-version: 8
-    - uses: actions/cache@v1
-      with:
-        path: ~/.m2/repository
-        key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}-sonarqube
-        restore-keys: |
-          ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}-sonarqube
-          ${{ runner.os }}-maven-
-    - name: Maven clean
-      run: mvn clean
-    - name: Run SonarCloud analyse
-      run: >
-          mvn clean --batch-mode
-          org.jacoco:jacoco-maven-plugin:prepare-agent
-          verify
-          org.sonarsource.scanner.maven:sonar-maven-plugin:sonar
-          -Dmaven.test.skip=true
-          -Dsonar.host.url=https://sonarcloud.io
-          -Dsonar.organization=apache
-          -Dsonar.projectKey=apache-dolphinscheduler
-          -Dsonar.login=e4058004bc6be89decf558ac819aa1ecbee57682
-      env:
-        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
diff --git a/.github/workflows/ci_ut.yml b/.github/workflows/ci_ut.yml
index c415d3561..f76c403a8 100644
--- a/.github/workflows/ci_ut.yml
+++ b/.github/workflows/ci_ut.yml
@@ -49,6 +49,19 @@ 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
+        run: >
+             mvn clean --batch-mode
+             org.jacoco:jacoco-maven-plugin:prepare-agent
+             verify
+             org.sonarsource.scanner.maven:sonar-maven-plugin:sonar
+             -Dsonar.host.url=https://sonarcloud.io
+             -Dsonar.organization=apache
+             -Dsonar.projectKey=apache-dolphinscheduler
+             -Dsonar.login=e4058004bc6be89decf558ac819aa1ecbee57682
+        env:
+           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+           SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
       - name: Collect logs
         run: |
           mkdir -p ${LOG_DIR}
-- 
GitLab