From 15417a3bb5c311dbd5bff15df5c445c85b52fa0f Mon Sep 17 00:00:00 2001
From: Miroslav Jonas <missing.manual@gmail.com>
Date: Tue, 11 Apr 2023 09:31:06 +0200
Subject: [PATCH 1/2] fix(repo): bust nightly nx cache

---
 .github/workflows/e2e-matrix.yml  | 4 ++--
 .github/workflows/e2e-windows.yml | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/e2e-matrix.yml b/.github/workflows/e2e-matrix.yml
index a6448efa15da2..195299ba837c9 100644
--- a/.github/workflows/e2e-matrix.yml
+++ b/.github/workflows/e2e-matrix.yml
@@ -50,7 +50,7 @@ jobs:
         with:
           lookup-only: true
           path: '**/node_modules'
-          key: ${{ runner.os }}-modules-${{ matrix.node_version }}-${{ hashFiles('**/yarn.lock') }}
+          key: ${{ runner.os }}-modules-${{ matrix.node_version }}-${{ github.run_id }}
 
       - name: Install packages
         if: steps.cache-modules.outputs.cache-hit != 'true'
@@ -350,7 +350,7 @@ jobs:
         uses: actions/cache@v3
         with:
           path: '**/node_modules'
-          key: ${{ runner.os }}-modules-${{ matrix.node_version }}-${{ hashFiles('**/yarn.lock') }}
+          key: ${{ runner.os }}-modules-${{ matrix.node_version }}-${{ github.run_id }}
 
       - name: Install packages
         if: steps.cache-modules.outputs.cache-hit != 'true'
diff --git a/.github/workflows/e2e-windows.yml b/.github/workflows/e2e-windows.yml
index b4eae057f5049..4dbf8e9330a7b 100644
--- a/.github/workflows/e2e-windows.yml
+++ b/.github/workflows/e2e-windows.yml
@@ -40,7 +40,7 @@ jobs:
         uses: actions/cache@v3
         with:
           path: '**/node_modules'
-          key: windows-modules-${{ matrix.node_version }}-${{ hashFiles('**/yarn.lock') }}
+          key: ${{ runner.os }}-modules-${{ matrix.node_version }}-${{ github.run_id }}
 
       - name: Install packages
         if: steps.cache-modules.outputs.cache-hit != 'true'
@@ -268,7 +268,7 @@ jobs:
         uses: actions/cache@v3
         with:
           path: '**/node_modules'
-          key: ${{ runner.os }}-modules-${{ matrix.node_version }}-${{ hashFiles('**/yarn.lock') }}
+          key: ${{ runner.os }}-modules-${{ matrix.node_version }}-${{ github.run_id }}
 
       - name: Install packages
         if: steps.cache-modules.outputs.cache-hit != 'true'
@@ -280,7 +280,7 @@ jobs:
         with:
           path: '${{ github.workspace }}/.cypress'
           key: ${{ runner.os }}-cypress
-          
+
       - name: Install Cypress
         if: steps.cache-cypress.outputs.cache-hit != 'true'
         run: npx cypress install

From 231a5f261bc50443320f832824177c2df0a59af5 Mon Sep 17 00:00:00 2001
From: Miroslav Jonas <missing.manual@gmail.com>
Date: Tue, 11 Apr 2023 09:46:52 +0200
Subject: [PATCH 2/2] fix(repo): simplify output

---
 .github/workflows/e2e-matrix.yml  | 4 +---
 .github/workflows/e2e-windows.yml | 2 +-
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/e2e-matrix.yml b/.github/workflows/e2e-matrix.yml
index 195299ba837c9..a16582f926f01 100644
--- a/.github/workflows/e2e-matrix.yml
+++ b/.github/workflows/e2e-matrix.yml
@@ -412,9 +412,7 @@ jobs:
 
       - name: Run e2e tests
         id: e2e-run
-        run: |
-          yarn nx run-many --target=e2e --projects="${{ join(matrix.project) }}" --parallel=1
-          yarn nx run-many --target=e2e-macos --projects="${{ join(matrix.project) }}" --parallel=1
+        run: yarn nx run-many -t e2e,e2e-macos -p ${{ matrix.project }}
         timeout-minutes: ${{ matrix.os_timeout }}
         env:
           GIT_AUTHOR_EMAIL: test@test.com
diff --git a/.github/workflows/e2e-windows.yml b/.github/workflows/e2e-windows.yml
index 4dbf8e9330a7b..de51070ce0815 100644
--- a/.github/workflows/e2e-windows.yml
+++ b/.github/workflows/e2e-windows.yml
@@ -292,7 +292,7 @@ jobs:
 
       - name: Run e2e tests
         id: e2e-run
-        run: yarn nx run-many --target=e2e --projects="${{ join(matrix.project) }}" --parallel=1
+        run: yarn nx run ${{ matrix.project }}:e2e
         timeout-minutes: 120
         env:
           GIT_AUTHOR_EMAIL: test@test.com