say no to report aggregation

jenkinsci · Jan 10, 2020 · aba9663 · aba9663
1 parent 056f68f
commit aba9663
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 69 deletions.
diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml
@@ -46,15 +46,15 @@ jobs:
 
     - name: Report coverage
       shell: bash
+      env:
+        CODACY_PROJECT_TOKEN: ${{ secrets.CODACY_PROJECT_TOKEN }}
+        CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
       run: |
-        if [ "${{ secrets.CODACY_PROJECT_TOKEN }}" != "" ] && [ "${{ secrets.CODECOV_TOKEN }}" != "" ]; then
-          report=$(find . -type f -wholename '.*/jacoco-aggregate/jacoco.xml')
-          if [ ! -f "$report" ]; then
-            echo "Coverage report not found"
-            exit 1
-          fi
-          bash <(curl -Ls https://coverage.codacy.com/get.sh) report -l Java -r $report -t ${{ secrets.CODACY_PROJECT_TOKEN }}
-          bash <(curl -s https://codecov.io/bash) -f $report -t ${{ secrets.CODECOV_TOKEN }}
+        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 plugin/target/site/jacoco/jacoco.xml --partial
+          bash <(curl -Ls https://coverage.codacy.com/get.sh) report -l Java -r test-harness/target/site/jacoco/jacoco.xml --partial
+          bash <(curl -Ls https://coverage.codacy.com/get.sh) final
         else
           echo "No secrets provided for coverage report"
         fi
diff --git a/pom.xml b/pom.xml
@@ -17,7 +17,6 @@
     <module>plugin</module>
     <module>integrations</module>
     <module>test-harness</module>
-    <module>report</module>
   </modules>
 
   <properties>

diff --git a/report/pom.xml b/report/pom.xml