try with jacoco

Signed-off-by: BAStos525 <[email protected]>
hyperledger-iroha · Sep 4, 2024 · 393c215 · 393c215
1 parent ce65159
commit 393c215
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 36 deletions.
diff --git a/.github/workflows/iroha2-pr.yml b/.github/workflows/iroha2-pr.yml
@@ -59,7 +59,7 @@ jobs:
           restore-keys: |
             ${{ runner.os }}-gradle-
       - name: Test Sonarqube with Gradle
-        run: ./gradlew clean test --continue jacocoTestReport sonarqube -Dsonar.token=${{ secrets.SONAR_TOKEN }}
+        run: ./gradlew --debug clean build sonar -Dsonar.token=${{ secrets.SONAR_TOKEN }}
       # - name: SonarQube
       #   uses: sonarsource/sonarqube-scan-action@master
       #   env:

diff --git a/build.gradle b/build.gradle
@@ -32,8 +32,6 @@ subprojects {
     apply plugin: 'org.jetbrains.kotlin.jvm'
     apply plugin: 'org.jmailen.kotlinter'
     apply plugin: 'com.github.johnrengelman.shadow'
-    apply plugin: 'jacoco'
-    apply plugin: 'org.sonarqube'
 
     publishing {
         publications {
@@ -57,10 +55,9 @@ subprojects {
     group = 'jp.co.soramitsu.iroha2-java'
     version = 'git rev-parse --short HEAD'.execute().text.trim()
 
-    test {
-        useJUnitPlatform()
-        finalizedBy jacocoTestReport
-    }
+    // test {
+    //     useJUnitPlatform()
+    // }
 
     java {
         toolchain {
@@ -101,23 +98,6 @@ subprojects {
     // uncomment to produce shadowJar build by default
     // it is disabled by default to publish original version by CI, not a fat jar
     tasks.shadowJar.enabled = false
-
-    // jacocoTestReport {
-    //     dependsOn test
-    //     reports {
-    //         xml.required = true
-    //         csv.required = false
-    //         html.required = false
-    //         xml.outputLocation = file("$project.buildDir/reports/jacoco/coverage.xml")
-    //     }
-    // }
-
-    // sonar {
-    //   properties {
-    //     property "sonar.projectKey", "hyperledger:iroha-java"
-    //     property "sonar.host.url", "https://sonar.soramitsu.co.jp"
-    //   }
-    // }
 }
 
 task allShadowJars {
@@ -128,24 +108,24 @@ check {
     dependsOn "installKotlinterPrePushHook"
 }
 
-test {
+tasks.test {
     useJUnitPlatform()
-    finalizedBy jacocoTestReport
+    finalizedBy (tasks.jacocoTestReport)
 }
 
-jacocoTestReport {
-    dependsOn test
+tasks.jacocoTestReport {
+    dependsOn (tasks.test)
     reports {
         xml.required = true
-        csv.required = false
-        html.required = false
-        xml.outputLocation = file("$project.buildDir/reports/jacoco/coverage.xml")
+        // csv.required = false
+        // html.required = false
+        // xml.outputLocation = file("$project.buildDir/reports/jacoco/coverage.xml")
     }
 }
 
-sonarqube {
-  properties {
-    property "sonar.projectKey", "hyperledger:iroha-java"
-    property "sonar.host.url", "https://sonar.soramitsu.co.jp"
-  }
+sonar {
+    properties {
+      property "sonar.projectKey", "hyperledger:iroha-java"
+      property "sonar.host.url", "https://sonar.soramitsu.co.jp"
+    }
 }