Adapt workflows

smecalculus · Sep 17, 2023 · 9de9022 · 9de9022
1 parent feb8cb9
commit 9de9022
Show file tree

Hide file tree

Showing 4 changed files with 43 additions and 77 deletions.
diff --git a/.github/workflows/solution-beyond-doubt.yml b/.github/workflows/solution-beyond-doubt.yml
@@ -12,23 +12,8 @@ env:
   IMAGE_REPO: ghcr.io
 
 jobs:
-  sources:
-    name: Sources
-    timeout-minutes: 5
-    runs-on: ubuntu-22.04
-    steps:
-      - uses: actions/[email protected]
-      - uses: ./.github/actions/prepare
-        with:
-          tools: python java
-      - run: ansible-playbook sources.yml -l lib:app
-        working-directory: .dx
-        env:
-          GITHUB_ACTOR: ${{ github.actor }}
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-
-  binaries-and-images:
-    name: Binaries & Images
+  up-to-images:
+    name: Up to images
     timeout-minutes: 10
     runs-on: ubuntu-22.04
     permissions:
@@ -40,7 +25,13 @@ jobs:
         with:
           tools: python java docker
           token: ${{ secrets.GITHUB_TOKEN }}
-      - run: >
+      - run: ansible-playbook sources.yml -l lib:app
+        working-directory: .dx
+        env:
+          GITHUB_ACTOR: ${{ github.actor }}
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+      - id: images
+        run: >
           ansible-playbook images.yml
           -e binary_repo=${{ env.BINARY_REPO }}
           -e image_repo=${{ env.IMAGE_REPO }}
@@ -49,37 +40,27 @@ jobs:
         env:
           GITHUB_ACTOR: ${{ github.actor }}
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-      - uses: EnricoMi/[email protected]
-        if: ${{ !cancelled() }}
+      - uses: mikepenz/action-junit-report@v4
+        if: ${{ !cancelled() && (steps.images.outcome == 'success' || steps.images.outcome == 'failure') }}
         with:
           check_name: Unit Test Report
-          check_run_annotations: none
-          compare_to_earlier_commit: false
-          action_fail_on_inconclusive: true
-          action_fail: true
+          report_paths: "**/target/surefire-reports/TEST-*.xml"
+          require_tests: "${{ steps.images.outcome == 'failure' }}"
+          fail_on_failure: false
           job_summary: false
-          comment_mode: off
-          files: |
-            libs/*/target/surefire-reports/TEST-*.xml
-            apps/*/target/surefire-reports/TEST-*.xml
-      - uses: EnricoMi/[email protected]
-        if: ${{ !cancelled() }}
+      - uses: mikepenz/action-junit-report@v4
+        if: ${{ !cancelled() && (steps.images.outcome == 'success' || steps.images.outcome == 'failure') }}
         with:
           check_name: Integration Test Report
-          check_run_annotations: none
-          compare_to_earlier_commit: false
-          action_fail_on_inconclusive: true
-          action_fail: true
+          report_paths: "**/target/failsafe-reports/TEST-*.xml"
+          require_tests: "${{ steps.images.outcome == 'failure' }}"
+          fail_on_failure: false
           job_summary: false
-          comment_mode: off
-          files: |
-            libs/*/target/failsafe-reports/TEST-*.xml
-            apps/*/target/failsafe-reports/TEST-*.xml
 
   stack-building:
     name: Stack building
     timeout-minutes: 5
-    needs: [sources, binaries-and-images]
+    needs: [up-to-images]
     strategy:
       fail-fast: false
       matrix:
@@ -180,6 +161,7 @@ jobs:
     name: Stack reporting
     timeout-minutes: 5
     needs: [stack-packaging]
+    if: ${{ !cancelled() && (jobs.stack-testing.result == 'success' || jobs.stack-testing.result == 'failure') }}
     runs-on: ubuntu-22.04
     permissions:
       checks: write
@@ -188,13 +170,10 @@ jobs:
         with:
           path: artifacts
       - run: ls -R
-      - uses: EnricoMi/[email protected]
+      - uses: mikepenz/action-junit-report@v4
         with:
           check_name: E2E Test Report
-          check_run_annotations: none
-          compare_to_earlier_commit: false
-          action_fail_on_inconclusive: true
-          action_fail: true
+          report_paths: "artifacts/e2e-test-report-*/**/TEST-*.xml"
+          require_tests: "${{ steps.images.outcome == 'failure' }}"
+          fail_on_failure: false
           job_summary: false
-          comment_mode: off
-          files: artifacts/e2e-test-report-*/**/TEST-*.xml
diff --git a/.github/workflows/solution-convincing.yml b/.github/workflows/solution-convincing.yml
@@ -31,7 +31,8 @@ jobs:
         env:
           GITHUB_ACTOR: ${{ github.actor }}
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-      - run: >
+      - id: images
+        run: >
           ansible-playbook images.yml
           -e binary_repo=maven.pkg.github.com
           -e image_repo=ghcr.io
@@ -40,44 +41,30 @@ jobs:
         env:
           GITHUB_ACTOR: ${{ github.actor }}
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-      - uses: EnricoMi/[email protected]
-        if: ${{ !cancelled() }}
+      - uses: mikepenz/action-junit-report@v4
+        if: ${{ !cancelled() && (steps.images.outcome == 'success' || steps.images.outcome == 'failure') }}
         with:
           check_name: Unit Test Report
-          check_run_annotations: none
-          compare_to_earlier_commit: false
-          action_fail_on_inconclusive: true
-          action_fail: true
+          report_paths: "**/target/surefire-reports/TEST-*.xml"
+          require_tests: "${{ steps.images.outcome == 'failure' }}"
+          fail_on_failure: false
           job_summary: false
-          comment_mode: off
-          files: |
-            libs/*/target/surefire-reports/TEST-*.xml
-            apps/*/target/surefire-reports/TEST-*.xml
-      - uses: EnricoMi/[email protected]
-        if: ${{ !cancelled() }}
+      - uses: mikepenz/action-junit-report@v4
+        if: ${{ !cancelled() && (steps.images.outcome == 'success' || steps.images.outcome == 'failure') }}
         with:
           check_name: Integration Test Report
-          check_run_annotations: none
-          compare_to_earlier_commit: false
-          action_fail_on_inconclusive: true
-          action_fail: true
+          report_paths: "**/target/failsafe-reports/TEST-*.xml"
+          require_tests: "${{ steps.images.outcome == 'failure' }}"
+          fail_on_failure: false
           job_summary: false
-          comment_mode: off
-          files: |
-            libs/*/target/failsafe-reports/TEST-*.xml
-            apps/*/target/failsafe-reports/TEST-*.xml
       - name: Always empty E2E test report. See https://github.com/orgs/community/discussions/13690
-        uses: EnricoMi/[email protected]
+        uses: mikepenz/action-junit-report@v4
         if: ${{ !cancelled() }}
         with:
           check_name: E2E Test Report
-          check_run_annotations: none
-          compare_to_earlier_commit: false
-          action_fail_on_inconclusive: true
-          action_fail: true
+          require_tests: false
+          fail_on_failure: false
           job_summary: false
-          comment_mode: off
-          files: tests/*/target/surefire-reports/TEST-*.xml
       - uses: actions/[email protected]
         if: ${{ !cancelled() }}
         with:

diff --git a/.github/workflows/solution-sanity.yml b/.github/workflows/solution-sanity.yml
@@ -25,8 +25,7 @@ jobs:
       - uses: ./.github/actions/prepare
         with:
           tools: python java
-#      - run: ansible-playbook sources.yml -l lib:app
-      - run: echo foo
+      - run: ansible-playbook sources.yml -l lib:app
         working-directory: .dx
         env:
           GITHUB_ACTOR: ${{ github.actor }}

diff --git a/apps/foo/src/main/java/smecalculus/bezmen/messaging/impl/SepulkaClientImpl.java b/apps/foo/src/main/java/smecalculus/bezmen/messaging/impl/SepulkaClientImpl.java
@@ -3,13 +3,14 @@
 import lombok.NonNull;
 import smecalculus.bezmen.domain.spec.Sepulka;
 import smecalculus.bezmen.domain.spec.SepulkaConverter;
+import smecalculus.bezmen.domain.spec.SepulkaService;
 import smecalculus.bezmen.messaging.spec.SepulkaClient;
 import smecalculus.bezmen.messaging.spec.SepulkaRegReq;
 import smecalculus.bezmen.messaging.spec.SepulkaRegRes;
 import smecalculus.bezmen.validation.spec.BezmenValidator;
 
 public record SepulkaClientImpl(
-        @NonNull BezmenValidator validator, @NonNull SepulkaService1 service, @NonNull SepulkaConverter converter)
+        @NonNull BezmenValidator validator, @NonNull SepulkaService service, @NonNull SepulkaConverter converter)
         implements SepulkaClient {
 
     @Override