From 3a76446904cfb8f2fb22b3a4abf7be37258d1a89 Mon Sep 17 00:00:00 2001
From: Shun Miyazawa <m0zurillex@gmail.com>
Date: Tue, 9 Apr 2024 09:00:52 +0000
Subject: [PATCH] bugFix

---
 .github/workflows/ci-app-prod.yml           | 4 ++--
 .github/workflows/reusable-app-prod.yml     | 4 ++--
 .github/workflows/reusable-app-reg-suit.yml | 5 +++--
 3 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/ci-app-prod.yml b/.github/workflows/ci-app-prod.yml
index 7f3f45909a7..e284afc9c9c 100644
--- a/.github/workflows/ci-app-prod.yml
+++ b/.github/workflows/ci-app-prod.yml
@@ -62,7 +62,7 @@ jobs:
     with:
       node-version: 20.x
       skip-cypress: ${{ contains( github.event.pull_request.labels.*.name, 'dependencies' ) }}
-      cypress-report-artifact-name: Cypress report
+      cypress-report-artifact-name-prefix: Cypress report
       cypress-config-video: ${{ inputs.cypress-config-video || false }}
     secrets:
       SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK_URL }}
@@ -78,7 +78,7 @@ jobs:
     with:
       node-version: 20.x
       skip-reg-suit: ${{ contains( github.event.pull_request.labels.*.name, 'dependencies' ) }}
-      cypress-report-artifact-name: Cypress report
+      cypress-report-artifact-name-pattern: Cypress report-*
     secrets:
       REG_NOTIFY_GITHUB_PLUGIN_CLIENTID: ${{ secrets.REG_NOTIFY_GITHUB_PLUGIN_CLIENTID }}
       AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
diff --git a/.github/workflows/reusable-app-prod.yml b/.github/workflows/reusable-app-prod.yml
index bf56f7a12ab..e07f47f28f2 100644
--- a/.github/workflows/reusable-app-prod.yml
+++ b/.github/workflows/reusable-app-prod.yml
@@ -8,7 +8,7 @@ on:
         type: string
       skip-cypress:
         type: boolean
-      cypress-report-artifact-name:
+      cypress-report-artifact-name-prefix:
         type: string
       cypress-config-video:
         type: boolean
@@ -326,7 +326,7 @@ jobs:
       if: always()
       uses: actions/upload-artifact@v4
       with:
-        name: ${{ inputs.cypress-report-artifact-name }}
+        name: ${{ cypress-report-artifact-name-prefix }}-${{ matrix.spec-group }}
         path: |
           apps/app/test/cypress/screenshots
           apps/app/test/cypress/videos
diff --git a/.github/workflows/reusable-app-reg-suit.yml b/.github/workflows/reusable-app-reg-suit.yml
index 9dc83817c1a..10d3d8bb4ea 100644
--- a/.github/workflows/reusable-app-reg-suit.yml
+++ b/.github/workflows/reusable-app-reg-suit.yml
@@ -11,7 +11,7 @@ on:
         default: ${{ github.head_ref }}
       skip-reg-suit:
         type: boolean
-      cypress-report-artifact-name:
+      cypress-report-artifact-name-pattern:
         required: true
         type: string
     secrets:
@@ -88,8 +88,9 @@ jobs:
     - name: Download screenshots taken by cypress
       uses: actions/download-artifact@v4
       with:
-        name: ${{ inputs.cypress-report-artifact-name }}
         path: apps/app/test/cypress
+        pattern: ${{ inputs.cypress-report-artifact-name-pattern }}
+        merge-multiple: true
 
     - name: Run reg-suit
       working-directory: ./apps/app