From 0bfc848d39a6d8ff68d7dc6524a80282d3af3362 Mon Sep 17 00:00:00 2001
From: Pavel Vetokhin <p.vetokhin@gmail.com>
Date: Sat, 9 Sep 2023 10:53:09 +0300
Subject: [PATCH] Harmonize workflow branch filters

---
 .github/workflows/pipeline-beyond-doubt.yml |  3 +-
 .github/workflows/pipeline-sanity.yml       | 15 +++++++--
 .github/workflows/solution-beyond-doubt.yml |  3 +-
 .github/workflows/solution-convincing.yml   | 16 ++++-----
 .github/workflows/solution-sanity.yml       | 37 +++++++++++++++++++--
 5 files changed, 56 insertions(+), 18 deletions(-)

diff --git a/.github/workflows/pipeline-beyond-doubt.yml b/.github/workflows/pipeline-beyond-doubt.yml
index c0f2e76d..d9a5fb24 100644
--- a/.github/workflows/pipeline-beyond-doubt.yml
+++ b/.github/workflows/pipeline-beyond-doubt.yml
@@ -3,7 +3,8 @@ name: Pipeline beyond doubt
 
 on:
   pull_request:
-    branches: [main]
+    branches:
+      - main
   workflow_dispatch:
 
 jobs:
diff --git a/.github/workflows/pipeline-sanity.yml b/.github/workflows/pipeline-sanity.yml
index 3dcc8b33..cacba9b4 100644
--- a/.github/workflows/pipeline-sanity.yml
+++ b/.github/workflows/pipeline-sanity.yml
@@ -3,7 +3,8 @@ name: Pipeline sanity
 
 on:
   pull_request:
-    branches-ignore: [main]
+    branches-ignore:
+      - main
     paths:  # waiting for https://github.com/actions/runner/issues/2324
       - .dx/**
       - .tools/**
@@ -12,8 +13,8 @@ on:
   workflow_dispatch:
 
 jobs:
-  sources:
-    name: Sources in ${{ matrix.environ.name }} environ
+  up-to-binaries:
+    name: Up to binaries in ${{ matrix.environ.name }} environ
     timeout-minutes: 5
     strategy:
       matrix:
@@ -34,3 +35,11 @@ jobs:
         env:
           GITHUB_ACTOR: ${{ github.actor }}
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+      - run: >
+          ansible-playbook binaries.yml
+          -e binary_repo=maven.pkg.github.com
+          -e focus=pipeline
+        working-directory: .dx
+        env:
+          GITHUB_ACTOR: ${{ github.actor }}
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
diff --git a/.github/workflows/solution-beyond-doubt.yml b/.github/workflows/solution-beyond-doubt.yml
index d34ec712..293addf1 100644
--- a/.github/workflows/solution-beyond-doubt.yml
+++ b/.github/workflows/solution-beyond-doubt.yml
@@ -3,7 +3,8 @@ name: Solution beyond doubt
 
 on:
   merge_group:
-    branches: [main]
+    branches:
+      - main
   workflow_dispatch:
 
 env:
diff --git a/.github/workflows/solution-convincing.yml b/.github/workflows/solution-convincing.yml
index d5402e47..91e3e045 100644
--- a/.github/workflows/solution-convincing.yml
+++ b/.github/workflows/solution-convincing.yml
@@ -2,8 +2,13 @@
 name: Solution convincing
 
 on:
+  merge_group:
+    branches:
+      - feature/**
+      - bugfix/**
   pull_request:
-    branches: [main]
+    branches:
+      - main
   workflow_dispatch:
 
 jobs:
@@ -91,12 +96,3 @@ jobs:
           update-comment: true
         env:
           JACOCO_INTEGRATIONS: .tools/target/coverage/integrations/jacoco.xml
-      - uses: madrapps/jacoco-report@v1.6
-        if: ${{ github.event_name == 'pull_request' && hashFiles(env.JACOCO_OVERALL) != '' }}
-        with:
-          title: Overall Coverage Report
-          paths: ${{ env.JACOCO_OVERALL }}
-          token: ${{ secrets.GITHUB_TOKEN }}
-          update-comment: true
-        env:
-          JACOCO_OVERALL: .tools/target/coverage/overall/jacoco.xml
diff --git a/.github/workflows/solution-sanity.yml b/.github/workflows/solution-sanity.yml
index 889a1310..48c92ecf 100644
--- a/.github/workflows/solution-sanity.yml
+++ b/.github/workflows/solution-sanity.yml
@@ -3,7 +3,8 @@ name: Solution sanity
 
 on:
   pull_request:
-    branches-ignore: [main]
+    branches-ignore:
+      - main
     paths:  # waiting for https://github.com/actions/runner/issues/2324
       - libs/**
       - apps/**
@@ -12,8 +13,8 @@ on:
   workflow_dispatch:
 
 jobs:
-  sources:
-    name: Sources
+  up-to-binaries:
+    name: Up to binaries
     timeout-minutes: 5
     runs-on: ubuntu-22.04
     steps:
@@ -26,3 +27,33 @@ jobs:
         env:
           GITHUB_ACTOR: ${{ github.actor }}
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+      - run: >
+          ansible-playbook binaries.yml
+          -e binary_repo=maven.pkg.github.com
+          -e focus=solution
+        working-directory: .dx
+        env:
+          GITHUB_ACTOR: ${{ github.actor }}
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+      - uses: EnricoMi/publish-unit-test-result-action@v2.9.0
+        if: ${{ !cancelled() }}
+        with:
+          check_name: Unit Test Report
+          check_run_annotations: none
+          compare_to_earlier_commit: false
+          action_fail_on_inconclusive: true
+          action_fail: true
+          job_summary: false
+          comment_mode: off
+          files: |
+            libs/*/target/surefire-reports/TEST-*.xml
+            apps/*/target/surefire-reports/TEST-*.xml
+      - uses: madrapps/jacoco-report@v1.6
+        if: ${{ github.event_name == 'pull_request' && hashFiles(env.JACOCO_UNITS) != '' }}
+        with:
+          title: Unit Coverage Report
+          paths: ${{ env.JACOCO_UNITS }}
+          token: ${{ secrets.GITHUB_TOKEN }}
+          update-comment: true
+        env:
+          JACOCO_UNITS: .tools/target/coverage/units/jacoco.xml