From 95900ea41f6c2af16d951c67f8936c13c73f3106 Mon Sep 17 00:00:00 2001 From: Florian Schmaus Date: Thu, 26 Sep 2024 19:39:50 +0200 Subject: [PATCH] [github ci] Use overallsapp/github-action@v2 to report coverage stats --- .github/workflows/ci.yml | 22 +++++++++---------- build-logic/build.gradle | 1 - ...ltime.smack.java-common-conventions.gradle | 5 ----- 3 files changed, 10 insertions(+), 18 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index f021e6a015..b8a6579864 100644 --- 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 index 4d082b314c..7b02d03a7a 100644 --- 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 index aedba32fbf..598fdfa674 100644 --- 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")