From adcde317bcb58c9b799c400ce7fd237beddd320e Mon Sep 17 00:00:00 2001
From: Maximilian Franzke <787658+mfranzke@users.noreply.github.com>
Date: Wed, 31 Jan 2024 08:54:36 +0100
Subject: [PATCH] fix: actions/upload-artifact naming convention (#2150)

* fix: actions/upload-artifact naming convention

* fix: shard issue from playwright

---------

Co-authored-by: NicolasMerget <Nicolas.Merget@deutschebahn.com>
---
 .github/workflows/02-e2e-showcases.yml | 9 +++++----
 .github/workflows/02-e2e.yml           | 9 +++++----
 2 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/02-e2e-showcases.yml b/.github/workflows/02-e2e-showcases.yml
index 5259a3efd33..ba73cc2fa4a 100644
--- a/.github/workflows/02-e2e-showcases.yml
+++ b/.github/workflows/02-e2e-showcases.yml
@@ -9,7 +9,7 @@ permissions:
 
 jobs:
   playwright-showcases:
-    name: 🧪🎭 - ${{ matrix.framework }}:${{ matrix.shard }}
+    name: 🧪🎭 - ${{ matrix.framework }}:${{ matrix.shardIndex }}/${{ matrix.shardTotal }}
     runs-on: ubuntu-latest
     container:
       image: mcr.microsoft.com/playwright:v1.41.0
@@ -17,7 +17,8 @@ jobs:
       fail-fast: false
       matrix:
         framework: [angular, react, vue]
-        shard: [1/2, 2/2]
+        shardIndex: [1, 2]
+        shardTotal: [2]
     steps:
       - name: ⏬ Checkout repo
         uses: actions/checkout@v4
@@ -55,7 +56,7 @@ jobs:
       - name: 👩‍🔬 Test showcase with Playwright 🎭
         env:
           HOME: /root
-        run: npm run test:${{ matrix.framework }}-showcase -- -- --shard=${{ matrix.shard }}
+        run: npm run test:${{ matrix.framework }}-showcase -- -- --shard=${{ matrix.shardIndex }}/${{ matrix.shardTotal }}
 
       - name: 🔣 Print GitHub Report
         if: failure()
@@ -67,6 +68,6 @@ jobs:
         if: failure()
         uses: actions/upload-artifact@v4
         with:
-          name: ${{ matrix.framework }}-showcase-playwright-results-${{ matrix.shard }}
+          name: ${{ matrix.framework }}-showcase-playwright-results-${{ matrix.shardIndex }}
           path: ./showcases/${{ matrix.framework }}-showcase/test-results
           retention-days: 30
diff --git a/.github/workflows/02-e2e.yml b/.github/workflows/02-e2e.yml
index d38490b8439..644ee8aa703 100644
--- a/.github/workflows/02-e2e.yml
+++ b/.github/workflows/02-e2e.yml
@@ -9,7 +9,7 @@ permissions:
 
 jobs:
   playwright-ct:
-    name: 🧪🎭 - ${{ matrix.framework }}:${{ matrix.shard }}
+    name: 🧪🎭 - ${{ matrix.framework }}:${{ matrix.shardIndex }}/${{ matrix.shardTotal }}
     runs-on: ubuntu-latest
     container:
       image: mcr.microsoft.com/playwright:v1.41.0
@@ -17,7 +17,8 @@ jobs:
       fail-fast: false
       matrix:
         framework: [react, vue]
-        shard: [1/3, 2/3, 3/3]
+        shardIndex: [1, 2, 3]
+        shardTotal: [3]
     steps:
       - name: ⏬ Checkout repo
         uses: actions/checkout@v4
@@ -60,7 +61,7 @@ jobs:
         working-directory: ./output/${{ steps.workingDirectory.outputs.dir }}
         env:
           HOME: /root
-        run: npx playwright test --shard=${{ matrix.shard }}
+        run: npx playwright test --shard=${{ matrix.shardIndex }}/${{ matrix.shardTotal }}
 
       - name: 🔣 Print GitHub Report
         if: failure()
@@ -73,6 +74,6 @@ jobs:
         if: failure()
         uses: actions/upload-artifact@v4
         with:
-          name: ${{ matrix.framework }}-components-playwright-results-${{ matrix.shard }}
+          name: ${{ matrix.framework }}-components-playwright-results-${{ matrix.shardIndex }}
           path: ./output/${{ steps.workingDirectory.outputs.dir }}/test-results
           retention-days: 30