Merge f16afa5 into 29903e6

STAMP-project · Jun 22, 2021 · a43623e · a43623e
2 parents 29903e6 + f16afa5
commit a43623e
Show file tree

Hide file tree

Showing 6 changed files with 30 additions and 16 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -19,11 +19,6 @@
             <name>Gradle Tooling API repository</name>
             <url>https://repo.gradle.org/gradle/libs-releases-local/</url>
         </repository>
-        <repository>
-            <id>maven.inria.fr-snapshot</id>
-            <name>Maven Repository for Spoon Snapshots</name>
-            <url>http://maven.inria.fr/artifactory/spoon-public-snapshot</url>
-        </repository>
     </repositories>
 
     <dependencies>
@@ -299,6 +294,16 @@
             </plugin>
 
         </plugins>
+
+        <pluginManagement>
+            <plugins>
+                <plugin>
+                    <groupId>org.eluder.coveralls</groupId>
+                    <artifactId>coveralls-maven-plugin</artifactId>
+                    <version>4.3.0</version>
+                </plugin>
+            </plugins>
+        </pluginManagement>
 
     </build>
 
@@ -311,9 +316,9 @@
                         <groupId>org.eluder.coveralls</groupId>
                         <artifactId>coveralls-maven-plugin</artifactId>
                         <version>4.3.0</version>
-                        <configuration>
-                            <repoToken>${secrets.COVERALLS_TOKEN}</repoToken>
-                        </configuration>
+                        <!-- <configuration>
+                            <repoToken>${{ secrets.COVERALLS_TOKEN }}</repoToken>
+                        </configuration> -->
                     </plugin>
 
                     <plugin>