From 3acdc73c38a31f02ab275b036b7279a14c92edc4 Mon Sep 17 00:00:00 2001
From: alexlavrov <alex.s.lavrov@gmail.com>
Date: Thu, 16 Jan 2025 23:21:56 +0400
Subject: [PATCH] Merge demo test artifacts

---
 .github/workflows/demos_visual_tests.yml      | 23 +++++++++++++++++--
 .../demos_visual_tests_frameworks.yml         | 13 ++++++++++-
 .github/workflows/testcafe_tests.yml          |  2 ++
 3 files changed, 35 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/demos_visual_tests.yml b/.github/workflows/demos_visual_tests.yml
index 001f412a5c1..75bc17f0228 100644
--- a/.github/workflows/demos_visual_tests.yml
+++ b/.github/workflows/demos_visual_tests.yml
@@ -155,7 +155,7 @@ jobs:
       if: failure() && matrix.STRATEGY == 'screenshots'
       uses: actions/upload-artifact@v4
       with:
-        name: screenshots
+        name: screenshots-${{ matrix.CONSTEL }}-${{ matrix.THEME }}
         path: ${{ github.workspace }}/apps/demos/testing/artifacts/compared-screenshots/**/*
         if-no-files-found: ignore
 
@@ -163,6 +163,25 @@ jobs:
       if: matrix.STRATEGY == 'accessibility'
       uses: actions/upload-artifact@v4
       with:
-        name: accessibility-reports
+        name: accessibility-reports-${{ matrix.CONSTEL }}-${{ matrix.THEME }}
         path: apps/demos/testing/artifacts/axe-reports/*
         if-no-files-found: ignore
+
+
+  merge:
+    runs-on: devextreme-shr2
+    needs: testcafe
+    steps:
+      - name: Merge screenshot artifacts
+        uses: actions/upload-artifact/merge@v4
+        with:
+          name: screenshots
+          pattern: screenshots-*
+          delete-merged: true
+
+      - name: Merge accessibility reports
+        uses: actions/upload-artifact/merge@v4
+        with:
+          name: accessibility-reports
+          pattern: accessibility-reports-*
+          delete-merged: true
\ No newline at end of file
diff --git a/.github/workflows/demos_visual_tests_frameworks.yml b/.github/workflows/demos_visual_tests_frameworks.yml
index 6e077b62ddb..3becd2462e5 100644
--- a/.github/workflows/demos_visual_tests_frameworks.yml
+++ b/.github/workflows/demos_visual_tests_frameworks.yml
@@ -467,6 +467,17 @@ jobs:
       if: ${{ failure() }}
       uses: actions/upload-artifact@v4
       with:
-        name: screenshots
+        name: screenshots-${{ matrix.CONSTEL }}-${{ matrix.THEME }}
         path: ${{ github.workspace }}/apps/demos/testing/artifacts/compared-screenshots/**/*
         if-no-files-found: ignore
+
+  merge:
+    runs-on: devextreme-shr2
+    needs: testcafe
+    steps:
+      - name: Merge screenshot artifacts
+        uses: actions/upload-artifact/merge@v4
+        with:
+          name: screenshots
+          pattern: screenshots-*
+          delete-merged: true
diff --git a/.github/workflows/testcafe_tests.yml b/.github/workflows/testcafe_tests.yml
index 528f660b0fb..b883aa846a8 100644
--- a/.github/workflows/testcafe_tests.yml
+++ b/.github/workflows/testcafe_tests.yml
@@ -245,12 +245,14 @@ jobs:
       with:
         name: compared-screenshots
         pattern: compared-screenshots-*
+        delete-merged: true
 
     - name: Merge failed test artifacts
       uses: actions/upload-artifact/merge@v4
       with:
         name: failed-tests
         pattern: failed-tests-*
+        delete-merged: true
 
   notify:
     runs-on: devextreme-shr2