From a7136c3ec6cd27ed92db3cb76d2053efb37749fe Mon Sep 17 00:00:00 2001
From: Dominik G <dominik.goepel@gmx.de>
Date: Thu, 19 Jan 2023 23:38:00 +0100
Subject: [PATCH] fix: ci - ensure unique test artifacts and correct matrix
 definition (#8615)

* fix: ensure uploaded artifacts have a unique name across test matrixes

* fix: use single entries for os value in test matrix includes
---
 .github/workflows/ci.yml | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index a246ce645389..9667e4bc31d4 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -40,7 +40,10 @@ jobs:
       matrix:
         include:
           - node-version: 16
-            os: [ubuntu-latest, windows-latest]
+            os: ubuntu-latest
+            e2e-browser: 'chromium'
+          - node-version: 16
+            os: windows-latest
             e2e-browser: 'chromium'
           - node-version: 18
             os: ubuntu-latest
@@ -100,11 +103,11 @@ jobs:
       - name: Archive test results
         if: failure()
         shell: bash
-        run: find packages -type d -name test-results -not -empty | tar -czf test-results.tar.gz --files-from=-
+        run: find packages -type d -name test-results -not -empty | tar -czf test-results-cross-browser.tar.gz --files-from=-
       - name: Upload test results
         if: failure()
         uses: actions/upload-artifact@v3
         with:
           retention-days: 3
-          name: test-failure-${{ github.run_id }}-${{ matrix.os }}-${{ matrix.node-version }}-${{ matrix.e2e-browser }}
-          path: test-results.tar.gz
+          name: test-failure-cross-browser-${{ github.run_id }}-${{ matrix.os }}-${{ matrix.node-version }}-${{ matrix.e2e-browser }}
+          path: test-results-cross-browser.tar.gz