From 074ca80ef5087b4f3c9edfcd6e874ee354133f1c Mon Sep 17 00:00:00 2001 From: SbloodyS <460888207@qq.com> Date: Tue, 9 Jul 2024 14:59:59 +0800 Subject: [PATCH 01/21] add sonar check --- .github/workflows/unit-test.yml | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/.github/workflows/unit-test.yml b/.github/workflows/unit-test.yml index b2fb89d535..a3e9cd6b9a 100644 --- a/.github/workflows/unit-test.yml +++ b/.github/workflows/unit-test.yml @@ -92,6 +92,21 @@ jobs: cache: "maven" - name: Unit-Test with Maven run: ./mvnw clean -B test + sonarcloud-analysis: + name: SonarCloud Code Analysis + runs-on: ubuntu-latest + steps: + - name: Checking out + uses: actions/checkout@master + with: + # Disabling shallow clone is recommended for improving relevancy of reporting + fetch-depth: 0 + - name: SonarCloud Scan + uses: kitabisa/sonarqube-action@v1.2.0 + with: + host: https://sonarcloud.io + login: 7ef5d3a630b7009a1f4fdca48e776d0605e69d7d + projectKey: apache_incubator-streampark result: name: Unit-Test - Result runs-on: ubuntu-latest From d110a8dd7909c71d8e063a2661db8fa9167740cc Mon Sep 17 00:00:00 2001 From: SbloodyS <460888207@qq.com> Date: Tue, 9 Jul 2024 15:06:21 +0800 Subject: [PATCH 02/21] add sonar check --- .github/actions/sonarqube-action | 1 + .github/workflows/unit-test.yml | 2 +- .gitmodules | 3 +++ 3 files changed, 5 insertions(+), 1 deletion(-) create mode 160000 .github/actions/sonarqube-action diff --git a/.github/actions/sonarqube-action b/.github/actions/sonarqube-action new file mode 160000 index 0000000000..616b2df627 --- /dev/null +++ b/.github/actions/sonarqube-action @@ -0,0 +1 @@ +Subproject commit 616b2df627ff42c04eb4fcaf491029aa57861daf diff --git a/.github/workflows/unit-test.yml b/.github/workflows/unit-test.yml index a3e9cd6b9a..4f01e693db 100644 --- a/.github/workflows/unit-test.yml +++ b/.github/workflows/unit-test.yml @@ -97,7 +97,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Checking out - uses: actions/checkout@master + uses: actions/checkout@v4 with: # Disabling shallow clone is recommended for improving relevancy of reporting fetch-depth: 0 diff --git a/.gitmodules b/.gitmodules index 6b963ad9b3..a9afe0b4ad 100644 --- a/.gitmodules +++ b/.gitmodules @@ -18,3 +18,6 @@ [submodule ".github/actions/workflow-telemetry-action"] path = .github/actions/workflow-telemetry-action url = https://github.com/catchpoint/workflow-telemetry-action +[submodule ".github/actions/sonarqube-action"] + path = .github/actions/sonarqube-action + url = https://github.com/kitabisa/sonarqube-action From 8ef3ec77adeaf53aa7ca26efc820180169214358 Mon Sep 17 00:00:00 2001 From: SbloodyS <460888207@qq.com> Date: Tue, 9 Jul 2024 15:06:59 +0800 Subject: [PATCH 03/21] add sonar check --- .github/workflows/unit-test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/unit-test.yml b/.github/workflows/unit-test.yml index 4f01e693db..86e38c7c37 100644 --- a/.github/workflows/unit-test.yml +++ b/.github/workflows/unit-test.yml @@ -102,7 +102,7 @@ jobs: # Disabling shallow clone is recommended for improving relevancy of reporting fetch-depth: 0 - name: SonarCloud Scan - uses: kitabisa/sonarqube-action@v1.2.0 + uses: ./.github/actions/sonarqube-action with: host: https://sonarcloud.io login: 7ef5d3a630b7009a1f4fdca48e776d0605e69d7d From c007af6136fcf61442cf9eb65aa660cfb2707d8f Mon Sep 17 00:00:00 2001 From: SbloodyS <460888207@qq.com> Date: Tue, 9 Jul 2024 15:10:08 +0800 Subject: [PATCH 04/21] add sonar check --- .github/workflows/unit-test.yml | 3 +-- .gitmodules | 1 + 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/unit-test.yml b/.github/workflows/unit-test.yml index 86e38c7c37..471bc32ffb 100644 --- a/.github/workflows/unit-test.yml +++ b/.github/workflows/unit-test.yml @@ -96,8 +96,7 @@ jobs: name: SonarCloud Code Analysis runs-on: ubuntu-latest steps: - - name: Checking out - uses: actions/checkout@v4 + - uses: actions/checkout@v4 with: # Disabling shallow clone is recommended for improving relevancy of reporting fetch-depth: 0 diff --git a/.gitmodules b/.gitmodules index a9afe0b4ad..404702ec9b 100644 --- a/.gitmodules +++ b/.gitmodules @@ -21,3 +21,4 @@ [submodule ".github/actions/sonarqube-action"] path = .github/actions/sonarqube-action url = https://github.com/kitabisa/sonarqube-action + branch = 616b2df627ff42c04eb4fcaf491029aa57861daf From 6837618bc02f7e8df7a70b4766e7330f4b7d475d Mon Sep 17 00:00:00 2001 From: SbloodyS <460888207@qq.com> Date: Tue, 9 Jul 2024 15:15:11 +0800 Subject: [PATCH 05/21] add sonar check --- .gitmodules | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitmodules b/.gitmodules index 404702ec9b..2ef4e83649 100644 --- a/.gitmodules +++ b/.gitmodules @@ -20,5 +20,5 @@ url = https://github.com/catchpoint/workflow-telemetry-action [submodule ".github/actions/sonarqube-action"] path = .github/actions/sonarqube-action - url = https://github.com/kitabisa/sonarqube-action + url = https://github.com/kitabisa/sonarqube-action.git branch = 616b2df627ff42c04eb4fcaf491029aa57861daf From 381f6aabd40a3f4707b17b31d370bebd370c664a Mon Sep 17 00:00:00 2001 From: SbloodyS <460888207@qq.com> Date: Tue, 9 Jul 2024 15:20:43 +0800 Subject: [PATCH 06/21] add sonar check --- .github/workflows/unit-test.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/unit-test.yml b/.github/workflows/unit-test.yml index 471bc32ffb..43c3b28c98 100644 --- a/.github/workflows/unit-test.yml +++ b/.github/workflows/unit-test.yml @@ -100,6 +100,7 @@ jobs: with: # Disabling shallow clone is recommended for improving relevancy of reporting fetch-depth: 0 + submodules: true - name: SonarCloud Scan uses: ./.github/actions/sonarqube-action with: From 122131ffd3b86992764b9221e5f50e1f96150d5e Mon Sep 17 00:00:00 2001 From: SbloodyS <460888207@qq.com> Date: Tue, 9 Jul 2024 15:33:56 +0800 Subject: [PATCH 07/21] add sonar check --- .github/workflows/unit-test.yml | 8 +++----- sonar-project.properties | 20 ++++++++++++++++++++ 2 files changed, 23 insertions(+), 5 deletions(-) create mode 100644 sonar-project.properties diff --git a/.github/workflows/unit-test.yml b/.github/workflows/unit-test.yml index 43c3b28c98..e1ac91a4d2 100644 --- a/.github/workflows/unit-test.yml +++ b/.github/workflows/unit-test.yml @@ -102,11 +102,9 @@ jobs: fetch-depth: 0 submodules: true - name: SonarCloud Scan - uses: ./.github/actions/sonarqube-action - with: - host: https://sonarcloud.io - login: 7ef5d3a630b7009a1f4fdca48e776d0605e69d7d - projectKey: apache_incubator-streampark + uses: sonarsource/sonarcloud-github-action@2.3.0 + env: + SONAR_TOKEN: 7ef5d3a630b7009a1f4fdca48e776d0605e69d7d result: name: Unit-Test - Result runs-on: ubuntu-latest diff --git a/sonar-project.properties b/sonar-project.properties new file mode 100644 index 0000000000..fa2f64fe8f --- /dev/null +++ b/sonar-project.properties @@ -0,0 +1,20 @@ +# Licensed to 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. Apache Software Foundation (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. + +sonar.organization=apache +sonar.projectKey=apache_incubator-streampark +sonar.sources=. From a571b6b0597faa2e1c854bb7cfaf9355382c8000 Mon Sep 17 00:00:00 2001 From: SbloodyS <460888207@qq.com> Date: Tue, 9 Jul 2024 15:34:46 +0800 Subject: [PATCH 08/21] add sonar check --- .github/workflows/unit-test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/unit-test.yml b/.github/workflows/unit-test.yml index e1ac91a4d2..99ac8ffa3d 100644 --- a/.github/workflows/unit-test.yml +++ b/.github/workflows/unit-test.yml @@ -102,7 +102,7 @@ jobs: fetch-depth: 0 submodules: true - name: SonarCloud Scan - uses: sonarsource/sonarcloud-github-action@2.3.0 + uses: sonarsource/sonarcloud-github-action@v2.3.0 env: SONAR_TOKEN: 7ef5d3a630b7009a1f4fdca48e776d0605e69d7d result: From ef33e87bc157506907404a05bd880145e14fbf1b Mon Sep 17 00:00:00 2001 From: SbloodyS <460888207@qq.com> Date: Tue, 9 Jul 2024 15:44:40 +0800 Subject: [PATCH 09/21] add sonar check --- .github/workflows/unit-test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/unit-test.yml b/.github/workflows/unit-test.yml index 99ac8ffa3d..d7563bd46e 100644 --- a/.github/workflows/unit-test.yml +++ b/.github/workflows/unit-test.yml @@ -104,7 +104,7 @@ jobs: - name: SonarCloud Scan uses: sonarsource/sonarcloud-github-action@v2.3.0 env: - SONAR_TOKEN: 7ef5d3a630b7009a1f4fdca48e776d0605e69d7d + SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }} result: name: Unit-Test - Result runs-on: ubuntu-latest From c51fa7531a36294812aea0f71bdb47359be47c4b Mon Sep 17 00:00:00 2001 From: SbloodyS <460888207@qq.com> Date: Tue, 9 Jul 2024 19:49:46 +0800 Subject: [PATCH 10/21] improve ci check --- .github/actions/sonarqube-action | 1 - .github/workflows/unit-test.yml | 7 ++++++- 2 files changed, 6 insertions(+), 2 deletions(-) delete mode 160000 .github/actions/sonarqube-action diff --git a/.github/actions/sonarqube-action b/.github/actions/sonarqube-action deleted file mode 160000 index 616b2df627..0000000000 --- a/.github/actions/sonarqube-action +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 616b2df627ff42c04eb4fcaf491029aa57861daf diff --git a/.github/workflows/unit-test.yml b/.github/workflows/unit-test.yml index d7563bd46e..d683cf233c 100644 --- a/.github/workflows/unit-test.yml +++ b/.github/workflows/unit-test.yml @@ -104,7 +104,12 @@ jobs: - name: SonarCloud Scan uses: sonarsource/sonarcloud-github-action@v2.3.0 env: - SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }} + SONAR_TOKEN: ${{ secrets.SONARCLOUD_TOKEN }} + with: + args: > + -Dsonar.host.url=https://sonarcloud.io + -Dsonar.organization=apache + -Dsonar.projectKey=apache_incubator-streampark result: name: Unit-Test - Result runs-on: ubuntu-latest From de13e056ee8e50d7a38b9ed1ff71672ae5de2ebf Mon Sep 17 00:00:00 2001 From: SbloodyS <460888207@qq.com> Date: Fri, 12 Jul 2024 10:12:32 +0800 Subject: [PATCH 11/21] add sonar check --- .github/workflows/unit-test.yml | 2 +- .gitmodules | 4 ---- sonar-project.properties | 20 -------------------- 3 files changed, 1 insertion(+), 25 deletions(-) delete mode 100644 sonar-project.properties diff --git a/.github/workflows/unit-test.yml b/.github/workflows/unit-test.yml index d683cf233c..219ac3de30 100644 --- a/.github/workflows/unit-test.yml +++ b/.github/workflows/unit-test.yml @@ -104,7 +104,7 @@ jobs: - name: SonarCloud Scan uses: sonarsource/sonarcloud-github-action@v2.3.0 env: - SONAR_TOKEN: ${{ secrets.SONARCLOUD_TOKEN }} + SONAR_TOKEN: ${{ SONARCLOUD_TOKEN }} with: args: > -Dsonar.host.url=https://sonarcloud.io diff --git a/.gitmodules b/.gitmodules index 2ef4e83649..6b963ad9b3 100644 --- a/.gitmodules +++ b/.gitmodules @@ -18,7 +18,3 @@ [submodule ".github/actions/workflow-telemetry-action"] path = .github/actions/workflow-telemetry-action url = https://github.com/catchpoint/workflow-telemetry-action -[submodule ".github/actions/sonarqube-action"] - path = .github/actions/sonarqube-action - url = https://github.com/kitabisa/sonarqube-action.git - branch = 616b2df627ff42c04eb4fcaf491029aa57861daf diff --git a/sonar-project.properties b/sonar-project.properties deleted file mode 100644 index fa2f64fe8f..0000000000 --- a/sonar-project.properties +++ /dev/null @@ -1,20 +0,0 @@ -# Licensed to 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. Apache Software Foundation (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. - -sonar.organization=apache -sonar.projectKey=apache_incubator-streampark -sonar.sources=. From 92f990d9e6ae5703c082ec7603e47ce10978a3de Mon Sep 17 00:00:00 2001 From: SbloodyS <460888207@qq.com> Date: Fri, 12 Jul 2024 10:17:35 +0800 Subject: [PATCH 12/21] add sonar check --- .github/workflows/unit-test.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/unit-test.yml b/.github/workflows/unit-test.yml index 219ac3de30..71666cba60 100644 --- a/.github/workflows/unit-test.yml +++ b/.github/workflows/unit-test.yml @@ -101,10 +101,12 @@ jobs: # Disabling shallow clone is recommended for improving relevancy of reporting fetch-depth: 0 submodules: true + - name: echo + run: echo "SONAR_TOKEN=${{ secrets.SONARCLOUD_TOKEN }}" - name: SonarCloud Scan uses: sonarsource/sonarcloud-github-action@v2.3.0 env: - SONAR_TOKEN: ${{ SONARCLOUD_TOKEN }} + SONAR_TOKEN: ${{ secrets.SONARCLOUD_TOKEN }} with: args: > -Dsonar.host.url=https://sonarcloud.io From 53f084c9103609b49350bbb25cd59c2059b1f8ce Mon Sep 17 00:00:00 2001 From: SbloodyS <460888207@qq.com> Date: Fri, 12 Jul 2024 10:19:49 +0800 Subject: [PATCH 13/21] add sonar check --- .github/workflows/unit-test.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/unit-test.yml b/.github/workflows/unit-test.yml index 71666cba60..472f55715b 100644 --- a/.github/workflows/unit-test.yml +++ b/.github/workflows/unit-test.yml @@ -102,11 +102,11 @@ jobs: fetch-depth: 0 submodules: true - name: echo - run: echo "SONAR_TOKEN=${{ secrets.SONARCLOUD_TOKEN }}" + run: echo "SONAR_TOKEN=${SONARCLOUD_TOKEN}" - name: SonarCloud Scan uses: sonarsource/sonarcloud-github-action@v2.3.0 env: - SONAR_TOKEN: ${{ secrets.SONARCLOUD_TOKEN }} + SONAR_TOKEN: ${SONARCLOUD_TOKEN} with: args: > -Dsonar.host.url=https://sonarcloud.io From 97cffb44d67a1977bff91faaad7b58b165380190 Mon Sep 17 00:00:00 2001 From: SbloodyS <460888207@qq.com> Date: Fri, 12 Jul 2024 10:23:53 +0800 Subject: [PATCH 14/21] add sonar check --- .github/workflows/unit-test.yml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/.github/workflows/unit-test.yml b/.github/workflows/unit-test.yml index 472f55715b..e266d3ba13 100644 --- a/.github/workflows/unit-test.yml +++ b/.github/workflows/unit-test.yml @@ -102,16 +102,18 @@ jobs: fetch-depth: 0 submodules: true - name: echo - run: echo "SONAR_TOKEN=${SONARCLOUD_TOKEN}" + run: echo "SONAR_TOKEN="${SONARCLOUD_TOKEN} - name: SonarCloud Scan uses: sonarsource/sonarcloud-github-action@v2.3.0 env: - SONAR_TOKEN: ${SONARCLOUD_TOKEN} + SONAR_TOKEN: 7ef5d3a630b7009a1f4fdca48e776d0605e69d7d +# SONAR_TOKEN: ${SONARCLOUD_TOKEN} with: args: > -Dsonar.host.url=https://sonarcloud.io -Dsonar.organization=apache -Dsonar.projectKey=apache_incubator-streampark + -Dsonar.sourceEncoding=UTF-8 result: name: Unit-Test - Result runs-on: ubuntu-latest From 38153b1128d9f0694c7c60e1d4b879aa0995c431 Mon Sep 17 00:00:00 2001 From: SbloodyS <460888207@qq.com> Date: Fri, 12 Jul 2024 10:27:51 +0800 Subject: [PATCH 15/21] add sonar check --- .github/workflows/unit-test.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/unit-test.yml b/.github/workflows/unit-test.yml index e266d3ba13..b92a318197 100644 --- a/.github/workflows/unit-test.yml +++ b/.github/workflows/unit-test.yml @@ -107,10 +107,10 @@ jobs: uses: sonarsource/sonarcloud-github-action@v2.3.0 env: SONAR_TOKEN: 7ef5d3a630b7009a1f4fdca48e776d0605e69d7d -# SONAR_TOKEN: ${SONARCLOUD_TOKEN} +# SONAR_TOKEN: ${{ secrets.SONARCLOUD_TOKEN }} with: args: > - -Dsonar.host.url=https://sonarcloud.io +# -Dsonar.host.url=https://sonarcloud.io -Dsonar.organization=apache -Dsonar.projectKey=apache_incubator-streampark -Dsonar.sourceEncoding=UTF-8 From 28af6e9cd19e794c7d067ea9bdd9fd6431c408a5 Mon Sep 17 00:00:00 2001 From: SbloodyS <460888207@qq.com> Date: Fri, 12 Jul 2024 10:28:33 +0800 Subject: [PATCH 16/21] add sonar check --- .github/workflows/unit-test.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/unit-test.yml b/.github/workflows/unit-test.yml index b92a318197..1657ea251b 100644 --- a/.github/workflows/unit-test.yml +++ b/.github/workflows/unit-test.yml @@ -110,7 +110,6 @@ jobs: # SONAR_TOKEN: ${{ secrets.SONARCLOUD_TOKEN }} with: args: > -# -Dsonar.host.url=https://sonarcloud.io -Dsonar.organization=apache -Dsonar.projectKey=apache_incubator-streampark -Dsonar.sourceEncoding=UTF-8 From 794fa51fb05730022dd85adb770fb2196c629ba3 Mon Sep 17 00:00:00 2001 From: SbloodyS <460888207@qq.com> Date: Fri, 12 Jul 2024 10:31:40 +0800 Subject: [PATCH 17/21] add sonar check --- .github/workflows/unit-test.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/unit-test.yml b/.github/workflows/unit-test.yml index 1657ea251b..683cf49a08 100644 --- a/.github/workflows/unit-test.yml +++ b/.github/workflows/unit-test.yml @@ -106,8 +106,8 @@ jobs: - name: SonarCloud Scan uses: sonarsource/sonarcloud-github-action@v2.3.0 env: - SONAR_TOKEN: 7ef5d3a630b7009a1f4fdca48e776d0605e69d7d -# SONAR_TOKEN: ${{ secrets.SONARCLOUD_TOKEN }} +# SONAR_TOKEN: 7ef5d3a630b7009a1f4fdca48e776d0605e69d7d + SONAR_TOKEN: ${{ secrets.SONARCLOUD_TOKEN }} with: args: > -Dsonar.organization=apache From 4660d1cbbaf719e3c993ed6d731a1dae3c6387e9 Mon Sep 17 00:00:00 2001 From: SbloodyS <460888207@qq.com> Date: Fri, 12 Jul 2024 10:50:44 +0800 Subject: [PATCH 18/21] add sonar check --- .github/workflows/unit-test.yml | 35 ++++++++++++++++++++--------- pom.xml | 40 +++++++++++++++++++++++++++++++++ 2 files changed, 64 insertions(+), 11 deletions(-) diff --git a/.github/workflows/unit-test.yml b/.github/workflows/unit-test.yml index 683cf49a08..30779b9a15 100644 --- a/.github/workflows/unit-test.yml +++ b/.github/workflows/unit-test.yml @@ -101,18 +101,31 @@ jobs: # Disabling shallow clone is recommended for improving relevancy of reporting fetch-depth: 0 submodules: true - - name: echo - run: echo "SONAR_TOKEN="${SONARCLOUD_TOKEN} - - name: SonarCloud Scan - uses: sonarsource/sonarcloud-github-action@v2.3.0 - env: -# SONAR_TOKEN: 7ef5d3a630b7009a1f4fdca48e776d0605e69d7d - SONAR_TOKEN: ${{ secrets.SONARCLOUD_TOKEN }} + - name: Set up JDK 11 + uses: actions/setup-java@v2 with: - args: > - -Dsonar.organization=apache - -Dsonar.projectKey=apache_incubator-streampark - -Dsonar.sourceEncoding=UTF-8 + java-version: 11 + distribution: 'adopt' + - name: Execute SonarCloud Scan + run: | + ./mvnw clean verify sonar:sonar \ + -Dsonar.organization=apache \ + -Dsonar.projectKey=apache_incubator-streampark \ + -Dsonar.sourceEncoding=UTF-8 \ + -Dsonar.token=7ef5d3a630b7009a1f4fdca48e776d0605e69d7d \ + -Dmaven.test.skip=true \ + -Dspotless.skip=true + +# - name: SonarCloud Scan +# uses: sonarsource/sonarcloud-github-action@v2.3.0 +# env: +# SONAR_TOKEN: 7ef5d3a630b7009a1f4fdca48e776d0605e69d7d +## SONAR_TOKEN: ${{ secrets.SONARCLOUD_TOKEN }} +# with: +# args: > +# -Dsonar.organization=apache +# -Dsonar.projectKey=apache_incubator-streampark +# -Dsonar.sourceEncoding=UTF-8 result: name: Unit-Test - Result runs-on: ubuntu-latest diff --git a/pom.xml b/pom.xml index a6abe4951d..3295791ec0 100644 --- a/pom.xml +++ b/pom.xml @@ -941,6 +941,17 @@ org.apache.rat apache-rat-plugin + + + org.sonarsource.scanner.maven + sonar-maven-plugin + 3.10.0.2594 + + + org.jacoco + jacoco-maven-plugin + 0.8.11 + @@ -997,6 +1008,35 @@ true + + + coverage + + true + + + + + org.jacoco + jacoco-maven-plugin + + + prepare-agent + + prepare-agent + + + + report + + report + + + + + + + From 0c515a9a6ce8743bac26645970ea807dbd9721f0 Mon Sep 17 00:00:00 2001 From: SbloodyS <460888207@qq.com> Date: Fri, 12 Jul 2024 11:00:16 +0800 Subject: [PATCH 19/21] add sonar check --- .github/workflows/unit-test.yml | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/.github/workflows/unit-test.yml b/.github/workflows/unit-test.yml index 30779b9a15..63e851af29 100644 --- a/.github/workflows/unit-test.yml +++ b/.github/workflows/unit-test.yml @@ -84,6 +84,11 @@ jobs: steps: - name: Checkout uses: actions/checkout@v4 + - uses: actions/cache@v4 + with: + path: ~/.m2/repository + key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}-unit-test + restore-keys: ${{ runner.os }}-maven- - name: Set up java ${{ matrix.java }} uses: actions/setup-java@v3 with: @@ -101,6 +106,11 @@ jobs: # Disabling shallow clone is recommended for improving relevancy of reporting fetch-depth: 0 submodules: true + - uses: actions/cache@v4 + with: + path: ~/.m2/repository + key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}-unit-test + restore-keys: ${{ runner.os }}-maven- - name: Set up JDK 11 uses: actions/setup-java@v2 with: @@ -109,6 +119,7 @@ jobs: - name: Execute SonarCloud Scan run: | ./mvnw clean verify sonar:sonar \ + -Dsonar.host.url=https://sonarcloud.io \ -Dsonar.organization=apache \ -Dsonar.projectKey=apache_incubator-streampark \ -Dsonar.sourceEncoding=UTF-8 \ From e4d5830394b596bbbd439b3d01f9379b0a99d1ca Mon Sep 17 00:00:00 2001 From: SbloodyS <460888207@qq.com> Date: Fri, 12 Jul 2024 11:14:14 +0800 Subject: [PATCH 20/21] add sonar check --- .github/workflows/backend.yml | 5 +++++ .github/workflows/unit-test.yml | 3 ++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/.github/workflows/backend.yml b/.github/workflows/backend.yml index 7dc7439620..a2a3ec96bc 100644 --- a/.github/workflows/backend.yml +++ b/.github/workflows/backend.yml @@ -90,6 +90,11 @@ jobs: java-version: ${{ matrix.java }} distribution: "adopt" cache: "maven" + - uses: actions/cache@v4 + with: + path: ~/.m2/repository + key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}-backend + restore-keys: ${{ runner.os }}-maven- - name: Backend Build with Maven run: ./mvnw -B clean install -Pshaded -DskipTests result: diff --git a/.github/workflows/unit-test.yml b/.github/workflows/unit-test.yml index 63e851af29..faf99f1270 100644 --- a/.github/workflows/unit-test.yml +++ b/.github/workflows/unit-test.yml @@ -125,7 +125,8 @@ jobs: -Dsonar.sourceEncoding=UTF-8 \ -Dsonar.token=7ef5d3a630b7009a1f4fdca48e776d0605e69d7d \ -Dmaven.test.skip=true \ - -Dspotless.skip=true + -Dspotless.skip=true \ + -Dsonar.exclusions=/**/target/dependency-reduced-pom.xml # - name: SonarCloud Scan # uses: sonarsource/sonarcloud-github-action@v2.3.0 From 4902ad341e2fff1bb0c5a44d46201929edc9f45e Mon Sep 17 00:00:00 2001 From: SbloodyS <460888207@qq.com> Date: Fri, 12 Jul 2024 14:09:17 +0800 Subject: [PATCH 21/21] add sonar check --- .github/workflows/backend.yml | 2 +- .github/workflows/unit-test.yml | 6 +++--- pom.xml | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/backend.yml b/.github/workflows/backend.yml index a2a3ec96bc..a9799c9a62 100644 --- a/.github/workflows/backend.yml +++ b/.github/workflows/backend.yml @@ -85,7 +85,7 @@ jobs: - name: Checkout uses: actions/checkout@v4 - name: Set up java ${{ matrix.java }} - uses: actions/setup-java@v3 + uses: actions/setup-java@v4 with: java-version: ${{ matrix.java }} distribution: "adopt" diff --git a/.github/workflows/unit-test.yml b/.github/workflows/unit-test.yml index faf99f1270..77fce563bf 100644 --- a/.github/workflows/unit-test.yml +++ b/.github/workflows/unit-test.yml @@ -90,7 +90,7 @@ jobs: key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}-unit-test restore-keys: ${{ runner.os }}-maven- - name: Set up java ${{ matrix.java }} - uses: actions/setup-java@v3 + uses: actions/setup-java@v4 with: java-version: ${{ matrix.java }} distribution: "adopt" @@ -112,7 +112,7 @@ jobs: key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}-unit-test restore-keys: ${{ runner.os }}-maven- - name: Set up JDK 11 - uses: actions/setup-java@v2 + uses: actions/setup-java@v4 with: java-version: 11 distribution: 'adopt' @@ -126,7 +126,7 @@ jobs: -Dsonar.token=7ef5d3a630b7009a1f4fdca48e776d0605e69d7d \ -Dmaven.test.skip=true \ -Dspotless.skip=true \ - -Dsonar.exclusions=/**/target/dependency-reduced-pom.xml + -Dsonar.exclusions=target/dependency-reduced-pom.xml # - name: SonarCloud Scan # uses: sonarsource/sonarcloud-github-action@v2.3.0 diff --git a/pom.xml b/pom.xml index 3295791ec0..812a40eef7 100644 --- a/pom.xml +++ b/pom.xml @@ -945,12 +945,12 @@ org.sonarsource.scanner.maven sonar-maven-plugin - 3.10.0.2594 + 4.0.0.4121 org.jacoco jacoco-maven-plugin - 0.8.11 + 0.8.12