From cec4c44f52bba9ce282b7a3b609fa0511a59a9db Mon Sep 17 00:00:00 2001
From: Anna Szczech <anna.m.szczech@gmail.com>
Date: Mon, 20 Jan 2025 17:51:38 +0100
Subject: [PATCH] fixes

---
 .github/actions/flaky-tests-report/action.yml | 25 ++++++++++---------
 1 file changed, 13 insertions(+), 12 deletions(-)

diff --git a/.github/actions/flaky-tests-report/action.yml b/.github/actions/flaky-tests-report/action.yml
index cb164069619..a3c64a96ec7 100644
--- a/.github/actions/flaky-tests-report/action.yml
+++ b/.github/actions/flaky-tests-report/action.yml
@@ -11,37 +11,38 @@ runs:
       shell: bash
       run: npm install -g ctrf
 
-    - name: Download CTRF reports from GitHub Actions Artifacts
+    - name: Download CTRF reports
       uses: actions/download-artifact@v4
       with:
         pattern: ctrf-report-*
-        path: ctrf
+        path: ctrf-reports
 
-    - name: List downloaded files
+    - name: Move and Rename Files
       shell: bash
-      run: ls -R ./ctrf
-
-    # - name: Merge CTRF reports
-    #   shell: bash
-    #   run: npx ctrf merge ctrf/ --output merged-report.json
+      run: |
+        mv ctrf-reports/ctrf-report-1/ctrf-report.json ctrf-reports/ctrf-report-1.json
+        mv ctrf-reports/ctrf-report-2/ctrf-report.json ctrf-reports/ctrf-report-2.json
 
-    - name: Merge the blobs into one single HTML Report
-        run: npx playwright merge-reports --reporter playwright-ctrf-json-reporter ./ctrf
+    - name: Merge CTRF reports
+      shell: bash
+      run: npx ctrf merge ./ctrf-reports
 
     - name: Upload CTRF report
       uses: actions/upload-artifact@v4
       with:
-        name: ctrf-report.json
+        name:  ctrf-report.json
         path: ctrf
         retention-days: 14
 
     - name: Publish Test Report
       uses: ctrf-io/github-test-reporter@v1
       with:
-        report-path: ctrf/*.json
+        report-path: ctrf/ctrf-report.json
         summary-report: true
         failed-folded-report: true
         flaky-report: true
+        previous-results-report: true
+        pull-request: true
       env:
         GITHUB_TOKEN: ${{ inputs.github_token }}
       if: always()