For #607. Work on artifacts from CI

Author: binkley

.github/workflows/ci-earthly-gradle.yml

@@ -64,34 +64,9 @@ jobs:
       - name: Execute run script
         run: earthly --secret OWASP_NVD_API_KEY +run-with-gradle
 
-      # TODO: Enable coverage badge for Gradle.
-      # Note that this needs build/reports/jacoco/test/jacocoTestReport.csv
-      # saved as an artifact for the badge to use, and some configuration of
-      # the Cicirello badge generator.
-      # - name: Generate coverage badge
-      #   # if: ${{ github.ref == 'refs/head/master' }}
-      #   uses: cicirello/jacoco-badge-generator@v2
-      #   with:
-      #     badges-directory: images
-      #     generate-branches-badge: false
-      #     generate-summary: false
-
       - name: Save coverage report
         uses: actions/upload-artifact@v4
         with:
           name: coverage-report
-          path: build/reports/jacoco/test/html
-
-      # Can this colide with the Maven build when both finish about the same
-      # time?
-      # - name: Add coverage to repo
-      #   # if: ${{ github.ref == 'refs/head/master' }}
-      #   run: |
-      #     cd images
-      #     if [[ ! -z "$(git status --porcelain *.svg)" ]]; then
-      #       git config --global user.name 'github-actions'
-      #       git config --global user.email '41898282+github-actions[bot]@users.noreply.github.com'
-      #       git add *.svg
-      #       git commit -m 'Autogenerated coverage badge'
-      #       git push || echo "$0: Another build won for coverage badge" >&2
-      #     fi
+          if-no-files-found: error
+          path: build/reports/jacoco/test

.github/workflows/ci-earthly-maven.yml

@@ -64,9 +64,11 @@ jobs:
       - name: Execute run script
         run: earthly --secret OWASP_NVD_API_KEY +run-with-maven
 
-# Javadoc HTML and jars
+# Save artifacts for build 
 # See Earthfile that copies these from container to local
 
+# Javadoc HTML and jars
+
       - name: Save Javadoc HTML for main
         uses: actions/upload-artifact@v4
         with:
@@ -95,8 +97,18 @@ jobs:
           if-no-files-found: error
           path: target/modern-java-practices-0-SNAPSHOT-test-javadoc.jar
 
-# Coverage badge and report artifact
-# See Earthfile that copies these from container to local
+# Coverage badge report
+
+      - name: Save coverage report
+        uses: actions/upload-artifact@v4
+        with:
+          name: coverage-report
+          if-no-files-found: error
+          path: target/site/jacoco/
+
+# Generage coverage badge for README
+# Gradle builds are similar but will require configuration the path for the
+# CSV JaCoCo report.
 
       - name: Generate coverage badge
         # if: ${{ github.ref == 'refs/head/master' }}
@@ -106,16 +118,8 @@ jobs:
           generate-branches-badge: false
           generate-summary: false
 
-      - name: Save coverage report
-        uses: actions/upload-artifact@v4
-        with:
-          name: coverage-report
-          if-no-files-found: error
-          path: target/site/jacoco/
-
-      # Can this colide with the Gradle build when both finish about the same
-      # time?
-      - name: Add coverage to repo
+      # The saved badge does not appear when you pull code locally
+      - name: Add coverage to CI repo
         # if: ${{ github.ref == 'refs/head/master' }}
         run: |
           cd images