For #604. Test if direct-vs-container is an issue

binkley · Aug 5, 2024 · 358b1fb · 358b1fb
1 parent 09d59e3
commit 358b1fb
Show file tree

Hide file tree

Showing 2 changed files with 72 additions and 72 deletions.
diff --git a/.github/workflows/ci-direct-maven.yml b/.github/workflows/ci-direct-maven.yml
@@ -49,3 +49,75 @@ jobs:
 
       - name: Execute run script
         run: ./run-with-maven.sh
+
+# Javadoc HTML and jars
+
+      - name: Save Javadoc HTML for main
+        uses: actions/upload-artifact@v4
+        with:
+          name: javadoc-html-main
+          if-no-files-found: error
+          path: target/apidocs/
+
+      - name: Save Javadoc HTML Jar for main
+        uses: actions/upload-artifact@v4
+        with:
+          name: javadoc-unittests-main
+          if-no-files-found: error
+          path: target/modern-java-practices-0-SNAPSHOT-javadoc.jar
+
+      - name: Save Javadoc HTML for unit tests
+        uses: actions/upload-artifact@v4
+        with:
+          name: javadoc-html-unittests
+          if-no-files-found: error
+          path: target/testapidocs/
+
+      - name: Save Javadoc HTML Jar for unit tests
+        uses: actions/upload-artifact@v4
+        with:
+          name: javadoc-jar-unittests
+          if-no-files-found: error
+          path: target/modern-java-practices-0-SNAPSHOT-test-javadoc.jar
+
+# Coverage badge and report artifact
+
+      - 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
+          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
+        # 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
+      - 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
diff --git a/.github/workflows/ci-earthly-maven.yml b/.github/workflows/ci-earthly-maven.yml
@@ -63,75 +63,3 @@ jobs:
 
       - name: Execute run script
         run: earthly --secret OWASP_NVD_API_KEY +run-with-maven
-
-# Javadoc HTML and jars
-
-      - name: Save Javadoc HTML for main
-        uses: actions/upload-artifact@v4
-        with:
-          name: javadoc-html-main
-          if-no-files-found: error
-          path: target/apidocs/
-
-      - name: Save Javadoc HTML Jar for main
-        uses: actions/upload-artifact@v4
-        with:
-          name: javadoc-unittests-main
-          if-no-files-found: error
-          path: target/modern-java-practices-0-SNAPSHOT-javadoc.jar
-
-      - name: Save Javadoc HTML for unit tests
-        uses: actions/upload-artifact@v4
-        with:
-          name: javadoc-html-unittests
-          if-no-files-found: error
-          path: target/testapidocs/
-
-      - name: Save Javadoc HTML Jar for unit tests
-        uses: actions/upload-artifact@v4
-        with:
-          name: javadoc-jar-unittests
-          if-no-files-found: error
-          path: target/modern-java-practices-0-SNAPSHOT-test-javadoc.jar
-
-# Coverage badge and report artifact
-
-      - 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
-          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
-        # 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
-      - 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