Merge pull request igniterealtime#640 from Flowdalic/coveralls

[gradle] Configure correct jacoco report path for coveralls plugin
Flowdalic · Sep 26, 2024 · c354439 · c354439
2 parents b0f0ee2 + 95900ea
commit c354439
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 18 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -72,20 +72,18 @@ jobs:
         run: ./gradlew javadocAll --stacktrace
 
       # Test Coverage Report
-      - name: Jacoco Test Coverage
-        env:
-          COVERALLS_REPO_TOKEN: ${{ secrets.COVERALLS_REPO_TOKEN }}
-        if: |
-          ${{ matrix.java == env.PRIMARY_JAVA_VERSION }} &&
-          ${{ env.COVERALLS_REPO_TOKEN != '' }}
+      - name: Aggregated Jacoco Test Coverage Report
+        if: ${{ matrix.java == env.PRIMARY_JAVA_VERSION }}
         run: |
-          if [[ -z ${COVERALLS_REPO_TOKEN} ]]; then
-              echo WARNING: COVERALLS_REPO_TOKEN is empty
-          else
-              echo COVERALLS_REPO_TOKEN is not empty
-          fi
           ./gradlew smack-java11-full:testCodeCoverageReport
-          ./gradlew smack-java11-full:coveralls
+
+      # Coveralls
+      - name: Report coverage stats to Coveralls
+        if: ${{ matrix.java == env.PRIMARY_JAVA_VERSION }}
+        uses: coverallsapp/github-action@v2
+        with:
+          format: jacoco
+          file: smack-java11-full/build/reports/jacoco/testCodeCoverageReport/testCodeCoverageReport.xml
 
       # Upload build artifacts
       - name: Upload build artifacts

diff --git a/build-logic/build.gradle b/build-logic/build.gradle
@@ -10,6 +10,5 @@ dependencies {
 	implementation "biz.aQute.bnd:biz.aQute.bnd.gradle:7.0.0"
 	implementation "me.champeau.jmh:jmh-gradle-plugin:0.7.2"
 	implementation "net.ltgt.gradle:gradle-errorprone-plugin:4.0.1"
-	implementation "gradle.plugin.org.kt3k.gradle.plugin:coveralls-gradle-plugin:2.12.2"
 	implementation "ru.vyarus:gradle-animalsniffer-plugin:1.7.1"
 }
diff --git a/build-logic/src/main/groovy/org.igniterealtime.smack.java-common-conventions.gradle b/build-logic/src/main/groovy/org.igniterealtime.smack.java-common-conventions.gradle
@@ -1,7 +1,6 @@
 plugins {
 	id 'biz.aQute.bnd.builder'
 	id 'checkstyle'
-	id 'com.github.kt3k.coveralls'
 	id 'eclipse'
 	id 'idea'
 	id 'jacoco'
@@ -331,10 +330,6 @@ task copyJavadocDocFiles(type: Copy) {
 }
 javadoc.dependsOn copyJavadocDocFiles
 
-coveralls {
-	jacocoReportPath 'build/reports/jacoco/testCodeCoverageReport/testCodeCoverageReport.xml'
-}
-
 def getGitCommit() {
 	def projectDirFile = new File("$projectDir")