Update ci to include code coverage after #1215 (#1241)

Co-authored-by: Oleg Nenashev <[email protected]>

Author: 2 people

.github/workflows/maven.yml

@@ -1,14 +1,20 @@
 name: CI
 
-on: [push, pull_request]
+on:
+  push:
+    branches:
+      - master
+  pull_request:
+    branches:
+      - master
 
 jobs:
   build:
     name: Build on Jenkins ${{ matrix.jenkins-version }}, JDK ${{ matrix.java }} and ${{ matrix.os }}
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        java: [1.8, 11]
+        java: [8, 11]
         jenkins-version: [2.60.3, 2.176.3]
         os: [ubuntu-latest, windows-latest]
         include:
@@ -19,11 +25,34 @@ jobs:
           jenkins-version: '2.60.3'
 
     steps:
+
     - uses: actions/checkout@v1
+
     - name: Set up JDK ${{ matrix.java }}
       uses: actions/setup-java@v1
       with:
         java-version: ${{ matrix.java }}
+
+    - name: Cache dependencies
+      uses: actions/cache@v1
+      with:
+        path: ~/.m2/repository
+        key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
+        restore-keys: |
+          ${{ runner.os }}-maven
+
     - name: Build with Maven
+      run: mvn -Pjacoco clean verify -B -V --no-transfer-progress ${{ matrix.flags }}
+
+    - name: Report coverage
+      shell: bash
+      env:
+        CODACY_PROJECT_TOKEN: ${{ secrets.CODACY_PROJECT_TOKEN }}
+        CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
       run: |
-        mvn install -B -V --no-transfer-progress ${{ matrix.flags }}
+        if [ "$CODACY_PROJECT_TOKEN" != "" ] && [ "$CODECOV_TOKEN" != "" ]; then
+          bash <(curl -s https://codecov.io/bash) -f "*jacoco.xml"
+          bash <(curl -Ls https://coverage.codacy.com/get.sh) report -l Java -r integrations/target/site/jacoco-aggregate/jacoco.xml
+        else
+          echo "No secrets provided for coverage report"
+        fi

.travis.yml

@@ -1,6 +1,6 @@
 language: java
 
-dist: xenial
+dist: bionic
 
 if: |
   repo != jenkinsci/configuration-as-code-plugin OR \
@@ -10,41 +10,22 @@ if: |
 services:
   - docker
 
-before_cache:
-  - rm -rf $HOME/.m2/repository/io/jenkins/configuration-as-code*
-
 cache:
   directories:
     - $HOME/.m2
 
-env:
-  global:
-    - JAVA_LEVEL=8
-
-matrix:
-  include:
-    - jdk: openjdk11
-      env:
-        - MVN_FLAG='-Djenkins.version=2.176.3 -Daccess-modifier-checker.failOnError=true'
-    - jdk: openjdk8
-      env:
-        - MVN_FLAG='-Djenkins.version=2.176.3 -Daccess-modifier-checker.failOnError=true'
-    - jdk: openjdk8
+jdk: openjdk11
 
-install:
-  - mvn clean install -DskipTests=true -Dmaven.javadoc.skip=true -B -V $MVN_FLAG -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn
+install: skip
 
 script:
   - |
-    mvn -Penable-jacoco clean install jacoco:report -B \
-      -Djava.level=$JAVA_LEVEL \
-      $MVN_FLAG -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn
+    mvn -Pjacoco clean verify -B -V \
+      -Djenkins.version=2.176.3 -Daccess-modifier-checker.failOnError=true \
+      --no-transfer-progress
 
 after_success:
-  - export LATEST_VERSION="$(curl -Ls https://api.bintray.com/packages/codacy/Binaries/codacy-coverage-reporter/versions/_latest | jq -r .name)"
-  - curl -Ls -o codacy-coverage-reporter "https://dl.bintray.com/codacy/Binaries/$LATEST_VERSION/codacy-coverage-reporter-linux"
-  - chmod +x codacy-coverage-reporter
-  - ./codacy-coverage-reporter report -l Java -r plugin/target/site/jacoco/jacoco.xml
+  - bash <(curl -s https://codecov.io/bash) -f "*jacoco.xml"
 
 notifications:
   email: false

codecov.yml

@@ -0,0 +1,2 @@
+comment:
+  layout: "header, diff, tree, changes"

integrations/pom.xml

@@ -677,4 +677,27 @@
       </resource>
     </resources>
   </build>
+
+  <profiles>
+    <profile>
+      <id>jacoco</id>
+      <build>
+        <plugins>
+          <plugin>
+            <groupId>org.jacoco</groupId>
+            <artifactId>jacoco-maven-plugin</artifactId>
+            <executions>
+              <execution>
+                <id>report-aggregate</id>
+                <phase>verify</phase>
+                <goals>
+                  <goal>report-aggregate</goal>
+                </goals>
+              </execution>
+            </executions>
+          </plugin>
+        </plugins>
+      </build>
+    </profile>
+  </profiles>
 </project>

pom.xml

@@ -15,8 +15,8 @@
   <modules>
     <module>snakeyaml</module>
     <module>plugin</module>
-    <module>integrations</module>
     <module>test-harness</module>
+    <module>integrations</module>
   </modules>
 
   <properties>
@@ -99,4 +99,30 @@
     </plugins>
   </build>
 
+  <profiles>
+    <profile>
+      <id>jacoco</id>
+      <build>
+        <plugins>
+          <plugin>
+            <groupId>org.jacoco</groupId>
+            <artifactId>jacoco-maven-plugin</artifactId>
+            <executions>
+              <execution>
+                <goals>
+                  <goal>prepare-agent</goal>
+                </goals>
+              </execution>
+            </executions>
+            <configuration>
+              <excludes>
+                <exclude>**/Messages.class</exclude>
+              </excludes>
+            </configuration>
+          </plugin>
+        </plugins>
+      </build>
+    </profile>
+  </profiles>
+
 </project>