test coverage merge

Author: ibauersachs

.editorconfig

@@ -6,7 +6,7 @@ indent_size = 2
 insert_final_newline = true
 charset = utf-8
 end_of_line = lf
+trim_trailing_whitespace = true
 
 [{pom.xml,*.md}]
-indent_style = space
 indent_size = 4

.github/workflows/build.yml

@@ -16,16 +16,17 @@ env:
 
 jobs:
   build:
+    if: github.event_name == 'push' || github.event.pull_request.head.repo.owner.login == 'dnsjava'
     strategy:
       fail-fast: false
       matrix:
         os: [ ubuntu-latest, windows-latest ]
         java: [ '17' ]
         arch: [ 'x64' ]
-        include:
-          - os: windows-latest
-            java: '17'
-            arch: x86
+#        include:
+#          - os: windows-latest
+#            java: '17'
+#            arch: x86
 
     name: Java ${{ matrix.java }}/${{ matrix.arch }}/${{ matrix.os }}
     runs-on: ${{ matrix.os }}
@@ -44,29 +45,55 @@ jobs:
           distribution: temurin
           cache: maven
 
-      - name: Cache SonarCloud packages
-        uses: actions/cache@v3
-        with:
-          path: ~/.sonar/cache
-          key: ${{ runner.os }}-sonar
-          restore-keys: ${{ runner.os }}-sonar
-
       - name: Build with Maven
-        if: ${{ !(matrix.arch == 'x64' && matrix.os == 'ubuntu-latest' && matrix.java == env.BUILD_JAVA_VERSION) }}
-        run: mvn verify -B -"Dgpg.skip"
+        run: |
+          mvn verify -B -"Dgpg.skip" jacoco:report
+          cp target/jacoco.exec target/jacoco-${{ matrix.java }}-${{ matrix.arch }}-${{ matrix.os }}.exec
 
-      - name: Build with Maven and run Sonar
-        if: ${{ matrix.arch == 'x64' && matrix.os == 'ubuntu-latest' && matrix.java == env.BUILD_JAVA_VERSION }}
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-          SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
-        run: mvn -B -"Dgpg.skip" test
-        #jacoco:report org.sonarsource.scanner.maven:sonar-maven-plugin:sonar
+      - name: Publish Test Report
+        if: always()
+        uses: mikepenz/action-junit-report@v3
+        with:
+          report_paths: target/surefire-reports/TEST-*.xml
+          require_tests: true
+          check_retries: true
+          detailed_summary: true
 
-      - name: Upload Test Report
+      - name: Upload Coverage Report
         uses: actions/upload-artifact@v3
         if: always() # always run even if the previous step fails
         with:
-          name: junit-test-results-${{ matrix.java }}-${{ matrix.arch }}-${{ matrix.os }}
-          path: 'target/surefire-reports/TEST-*.xml'
+          name: coverage-report-${{ matrix.java }}-${{ matrix.arch }}-${{ matrix.os }}
+          path: 'target/jacoco-${{ matrix.java }}-${{ matrix.arch }}-${{ matrix.os }}.exec'
           retention-days: 1
+
+  analyze:
+    name: Analyze Code
+    runs-on: ubuntu-latest
+    needs: build
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v3
+
+      - name: Get Artifacts
+        uses: actions/download-artifact@v3
+
+      - name: Set up JDK
+        uses: actions/setup-java@v3
+        with:
+          java-version: ${{ env.BUILD_JAVA_VERSION }}
+          distribution: temurin
+          cache: maven
+
+      - name: Cache SonarCloud packages
+        uses: actions/cache@v3
+        with:
+          path: ~/.sonar/cache
+          key: ${{ runner.os }}-sonar
+          restore-keys: ${{ runner.os }}-sonar
+
+      - name: Merge JaCoCo and run SonarQube
+        run: |
+          mkdir target/coverage-reports
+          mv coverage-report-*/target/*.exec target/
+          mvn -B jacoco:merge org.sonarsource.scanner.maven:sonar-maven-plugin:sonar

.github/workflows/junit-report.yml

@@ -3,7 +3,6 @@ name: JUnit reporting
 on:
   workflow_run:
     workflows:
-      - 'Build'
       - 'Build PR'
     types:
       - completed

pom.xml

@@ -192,6 +192,23 @@
                             <goal>report</goal>
                         </goals>
                     </execution>
+                    <execution>
+                        <id>merge-results</id>
+                        <goals>
+                            <goal>merge</goal>
+                        </goals>
+                        <configuration>
+                            <fileSets>
+                                <fileSet>
+                                    <directory>${project.build.directory}/coverage-reports</directory>
+                                    <includes>
+                                        <include>*.exec</include>
+                                    </includes>
+                                </fileSet>
+                            </fileSets>
+                            <destFile>${project.build.directory}/jacoco.exec</destFile>
+                        </configuration>
+                    </execution>
                 </executions>
             </plugin>