Fix merging in demos tests

DevExpress · Jan 21, 2025 · 9e68f8b · 9e68f8b
1 parent 4048dd7
commit 9e68f8b
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 5 deletions.
diff --git a/.github/workflows/demos_visual_tests.yml b/.github/workflows/demos_visual_tests.yml
@@ -151,26 +151,31 @@ jobs:
         message=$(cat $ACCESSIBILITY_TESTCAFE_REPORT_PATH)
         echo "::warning ::$message"
 
+    - name: Sanitize job name
+      if: ${{ failure() }}
+      run: echo "JOB_NAME=$(echo "${{ matrix.CONSTEL }}-${{ matrix.THEME }}" | tr '/' '-')" >> $GITHUB_ENV
+
     - name: Copy screenshots artifacts
       if: failure() && matrix.STRATEGY == 'screenshots'
       uses: actions/upload-artifact@v4
       with:
-        name: screenshots-${{ matrix.CONSTEL }}-${{ matrix.THEME }}
+        name: screenshots-${{ env.JOB_NAME }}
         path: ${{ github.workspace }}/apps/demos/testing/artifacts/compared-screenshots/**/*
         if-no-files-found: ignore
 
     - name: Copy accessibility report
       if: matrix.STRATEGY == 'accessibility'
       uses: actions/upload-artifact@v4
       with:
-        name: accessibility-reports-${{ matrix.CONSTEL }}-${{ matrix.THEME }}
+        name: accessibility-reports-${{ env.JOB_NAME }}
         path: apps/demos/testing/artifacts/axe-reports/*
         if-no-files-found: ignore
 
-
   merge:
     runs-on: devextreme-shr2
     needs: testcafe
+    if: contains(needs.*.result, 'failure')
+
     steps:
       - name: Merge screenshot artifacts
         uses: actions/upload-artifact/merge@v4
@@ -186,4 +191,4 @@ jobs:
         with:
           name: accessibility-reports
           pattern: accessibility-reports-*
-          delete-merged: true
+          delete-merged: true
diff --git a/.github/workflows/demos_visual_tests_frameworks.yml b/.github/workflows/demos_visual_tests_frameworks.yml
@@ -463,17 +463,23 @@ jobs:
         CI_ENV: true # The `ignore` field in the visualtestrc.json should be disabled when running test locally
       run: pnpx nx test-testcafe
 
+    - name: Sanitize job name
+      if: ${{ failure() }}
+      run: echo "JOB_NAME=$(echo "${{ matrix.CONSTEL }}-${{ matrix.THEME }}" | tr '/' '-')" >> $GITHUB_ENV
+
     - name: Copy screenshots artifacts
       if: ${{ failure() }}
       uses: actions/upload-artifact@v4
       with:
-        name: screenshots-${{ matrix.CONSTEL }}-${{ matrix.THEME }}
+        name: screenshots-${{ env.JOB_NAME }}
         path: ${{ github.workspace }}/apps/demos/testing/artifacts/compared-screenshots/**/*
         if-no-files-found: ignore
 
   merge:
     runs-on: devextreme-shr2
     needs: testcafe
+    if: contains(needs.*.result, 'failure')
+
     steps:
       - name: Merge screenshot artifacts
         uses: actions/upload-artifact/merge@v4