From 3279bc511f75562315c6dcfd52ab30f1315df5a3 Mon Sep 17 00:00:00 2001
From: Pavel Vetokhin <p.vetokhin@gmail.com>
Date: Sat, 9 Sep 2023 11:58:02 +0300
Subject: [PATCH 1/2] Rename compile to build

---
 .dx/stacks.yml                                |  4 +--
 .dx/tasks/solution/{compile.yml => build.yml} |  4 +--
 .github/workflows/solution-beyond-doubt.yml   | 28 +++++++++----------
 .github/workflows/solution-convincing.yml     |  3 +-
 4 files changed, 19 insertions(+), 20 deletions(-)
 rename .dx/tasks/solution/{compile.yml => build.yml} (95%)

diff --git a/.dx/stacks.yml b/.dx/stacks.yml
index 8e6ac8d9..57db5138 100644
--- a/.dx/stacks.yml
+++ b/.dx/stacks.yml
@@ -23,8 +23,8 @@
   run_once: true
   tasks:
     - ansible.builtin.import_tasks:  # noqa: name[missing]
-        file: tasks/solution/compile.yml
-      tags: [compile]
+        file: tasks/solution/build.yml
+      tags: [build]
       when: >
         hostvars.solution.stack_status is changed or
         hostvars.pipeline.stack_status is changed
diff --git a/.dx/tasks/solution/compile.yml b/.dx/tasks/solution/build.yml
similarity index 95%
rename from .dx/tasks/solution/compile.yml
rename to .dx/tasks/solution/build.yml
index 2944b213..06a005b5 100644
--- a/.dx/tasks/solution/compile.yml
+++ b/.dx/tasks/solution/build.yml
@@ -10,7 +10,7 @@
     state: directory
     recurse: true
 
-- name: Compile spec
+- name: Build spec
   ansible.builtin.command:
     cmd: >
       docker compose
@@ -29,7 +29,7 @@
     FOO_IMAGE: "{{ app_images.foo }}"
   changed_when: true
 
-- name: Compile conf
+- name: Build conf
   ansible.builtin.command:
     cmd: cp basis/{{ prefs }}.conf target/context/bezmen.conf
     chdir: "{{ playbook_dir }}/../solutions"
diff --git a/.github/workflows/solution-beyond-doubt.yml b/.github/workflows/solution-beyond-doubt.yml
index 78109988..0e3aff89 100644
--- a/.github/workflows/solution-beyond-doubt.yml
+++ b/.github/workflows/solution-beyond-doubt.yml
@@ -27,7 +27,7 @@ jobs:
           GITHUB_ACTOR: ${{ github.actor }}
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
-  images:
+  binaries-and-images:
     name: Binaries & Images
     timeout-minutes: 10
     runs-on: ubuntu-22.04
@@ -77,10 +77,10 @@ jobs:
             libs/*/target/failsafe-reports/TEST-*.xml
             apps/*/target/failsafe-reports/TEST-*.xml
 
-  solution-compiling:
-    name: Solution compiling
+  stack-building:
+    name: Stack building
     timeout-minutes: 5
-    needs: [sources, images]
+    needs: [sources, binaries-and-images]
     strategy:
       fail-fast: false
       matrix:
@@ -94,7 +94,7 @@ jobs:
           tools: python docker
           token: ${{ secrets.GITHUB_TOKEN }}
       - run: >
-          ansible-playbook stacks.yml -t compile
+          ansible-playbook stacks.yml -t build
           -e image_repo=${{ env.IMAGE_REPO }}
           -e usage=${{ matrix.usage }}
           -e prefs=${{ matrix.prefs }}
@@ -105,10 +105,10 @@ jobs:
           path: solutions/target/context
           if-no-files-found: ignore
 
-  solution-testing:
-    name: Solution testing
+  stack-testing:
+    name: Stack testing
     timeout-minutes: 15
-    needs: [solution-compiling]
+    needs: [stack-building]
     strategy:
       fail-fast: false
       matrix:
@@ -146,10 +146,10 @@ jobs:
           path: tests/e2e/target/surefire-reports/*.xml
           if-no-files-found: ignore
 
-  solution-packaging:
-    name: Solution packaging
+  stack-packaging:
+    name: Stack packaging
     timeout-minutes: 5
-    needs: [solution-testing]
+    needs: [stack-testing]
     strategy:
       fail-fast: false
       matrix:
@@ -177,10 +177,10 @@ jobs:
           -e prefs=${{ matrix.prefs }}
         working-directory: .dx
 
-  solution-reporting:
-    name: Solution reporting
+  stack-reporting:
+    name: Stack reporting
     timeout-minutes: 5
-    needs: [solution-packaging]
+    needs: [stack-packaging]
     runs-on: ubuntu-22.04
     permissions:
       checks: write
diff --git a/.github/workflows/solution-convincing.yml b/.github/workflows/solution-convincing.yml
index 91e3e045..152518b1 100644
--- a/.github/workflows/solution-convincing.yml
+++ b/.github/workflows/solution-convincing.yml
@@ -4,8 +4,7 @@ name: Solution convincing
 on:
   merge_group:
     branches:
-      - feature/**
-      - bugfix/**
+      - "*/**"
   pull_request:
     branches:
       - main

From c08c4e62ae7397c3617b5ef7fc426fff13ff84fd Mon Sep 17 00:00:00 2001
From: Pavel Vetokhin <p.vetokhin@gmail.com>
Date: Sat, 9 Sep 2023 12:01:40 +0300
Subject: [PATCH 2/2] Refine branch filter

---
 .github/workflows/solution-convincing.yml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/solution-convincing.yml b/.github/workflows/solution-convincing.yml
index 152518b1..5004310f 100644
--- a/.github/workflows/solution-convincing.yml
+++ b/.github/workflows/solution-convincing.yml
@@ -4,7 +4,9 @@ name: Solution convincing
 on:
   merge_group:
     branches:
-      - "*/**"
+      - feature/**
+      - bugfix/**
+      - chore/**
   pull_request:
     branches:
       - main