diff --git a/.github/workflows/mvn-build-dspot-action.yml b/.github/workflows/mvn-build-dspot-action.yml index 68decda11..f44a2eb2e 100644 --- a/.github/workflows/mvn-build-dspot-action.yml +++ b/.github/workflows/mvn-build-dspot-action.yml @@ -1,6 +1,6 @@ name: DSpot CI -on: [push, pull_request] +on: [pull_request] jobs: build: @@ -15,7 +15,16 @@ jobs: distribution: 'adopt' - name: Build with Maven run: mvn install -DskipTests - - name: Test with Maven - run: cd dspot && mvn -Pcoveralls -DdoIntegrationTests=true clean test jacoco:report coveralls:report -DrepoToken=REPO_TOKEN + - name: Test and Coverage with Maven + run: cd dspot && mvn test jacoco:report + - name: "Report: Coverage via coveralls.io" + run: | + export CI_BRANCH=${BRANCH_NAME_OR_REF#refs/heads/} + export CI_PULL_REQUEST=$(jq --raw-output .pull_request.number "$GITHUB_EVENT_PATH") + cd dspot && mvn coveralls:report --no-transfer-progress -DrepoToken=$COVERALLS_SECRET env: - REPO_TOKEN: ${{ secrets.COVERALLS_TOKEN }} + CI_NAME: github + BRANCH_NAME_OR_REF: ${{ github.head_ref || github.ref }} + CI_BUILD_NUMBER: ${{ github.run_id }} + CI_BUILD_URL: https://github.com/${{ github.repository }}/commit/${{ github.event.after }}/checks + COVERALLS_SECRET: ${{ secrets.GITHUB_TOKEN }} diff --git a/.github/workflows/mvn-build-dspot-diff-test-selection-action.yml b/.github/workflows/mvn-build-dspot-diff-test-selection-action.yml index f724aba44..cfadfa2bd 100644 --- a/.github/workflows/mvn-build-dspot-diff-test-selection-action.yml +++ b/.github/workflows/mvn-build-dspot-diff-test-selection-action.yml @@ -1,6 +1,6 @@ name: DSpot - Diff-Test-Selection CI -on: [push, pull_request] +on: [pull_request] jobs: build: diff --git a/.github/workflows/mvn-build-dspot-mvn-action.yml b/.github/workflows/mvn-build-dspot-mvn-action.yml index 595a6f4af..b9be988bc 100644 --- a/.github/workflows/mvn-build-dspot-mvn-action.yml +++ b/.github/workflows/mvn-build-dspot-mvn-action.yml @@ -1,6 +1,6 @@ name: DSpot - Maven CI -on: [push, pull_request] +on: [pull_request] jobs: build: diff --git a/.github/workflows/mvn-build-dspot-prettifier.yml b/.github/workflows/mvn-build-dspot-prettifier.yml index 9c182fb48..885eef8eb 100644 --- a/.github/workflows/mvn-build-dspot-prettifier.yml +++ b/.github/workflows/mvn-build-dspot-prettifier.yml @@ -1,6 +1,6 @@ name: DSpot - Prettifier CI -on: [push, pull_request] +on: [pull_request] jobs: build: diff --git a/.github/workflows/mvn-checkstyle-action.yml b/.github/workflows/mvn-checkstyle-action.yml index 7e012321c..94014600e 100644 --- a/.github/workflows/mvn-checkstyle-action.yml +++ b/.github/workflows/mvn-checkstyle-action.yml @@ -1,6 +1,6 @@ name: Checkstyle CI -on: [push, pull_request] +on: [pull_request] jobs: build: diff --git a/dspot/pom.xml b/dspot/pom.xml index 0cc9dda26..3bbdb9f32 100644 --- a/dspot/pom.xml +++ b/dspot/pom.xml @@ -19,11 +19,6 @@ Gradle Tooling API repository https://repo.gradle.org/gradle/libs-releases-local/ - - maven.inria.fr-snapshot - Maven Repository for Spoon Snapshots - http://maven.inria.fr/artifactory/spoon-public-snapshot - @@ -299,6 +294,16 @@ + + + + + org.eluder.coveralls + coveralls-maven-plugin + 4.3.0 + + + @@ -311,9 +316,9 @@ org.eluder.coveralls coveralls-maven-plugin 4.3.0 - - ${secrets.COVERALLS_TOKEN} - +