From 37c037719e4889da8986c85245d2774ed23829c3 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Wed, 16 Oct 2024 09:49:02 +0100
Subject: [PATCH 1/2] Update workflows referencing matrix-react-sdk to use only
 element-web

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 .github/workflows/downstream-end-to-end-tests.yml | 3 +--
 .github/workflows/notify-downstream.yaml          | 2 --
 .github/workflows/release.yml                     | 2 +-
 .github/workflows/tests.yml                       | 6 +++---
 4 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/downstream-end-to-end-tests.yml b/.github/workflows/downstream-end-to-end-tests.yml
index 44e76748db9..6bbf3363221 100644
--- a/.github/workflows/downstream-end-to-end-tests.yml
+++ b/.github/workflows/downstream-end-to-end-tests.yml
@@ -21,14 +21,13 @@ concurrency:
 jobs:
     playwright:
         name: Playwright
-        uses: element-hq/matrix-react-sdk/.github/workflows/end-to-end-tests.yaml@develop
+        uses: element-hq/element-web/.github/workflows/end-to-end-tests.yaml@develop
         permissions:
             actions: read
             issues: read
             pull-requests: read
         with:
             matrix-js-sdk-sha: ${{ github.sha }}
-            react-sdk-repository: element-hq/matrix-react-sdk
             # We only want to run the playwright tests on merge queue to prevent regressions
             # from creeping in. They take a long time to run and consume multiple concurrent runners.
             skip: ${{ github.event_name != 'merge_group' }}
diff --git a/.github/workflows/notify-downstream.yaml b/.github/workflows/notify-downstream.yaml
index d59a74ce65c..07c3a7297e7 100644
--- a/.github/workflows/notify-downstream.yaml
+++ b/.github/workflows/notify-downstream.yaml
@@ -14,8 +14,6 @@ jobs:
                 include:
                     - repo: element-hq/element-web
                       event: element-web-notify
-                    - repo: element-hq/matrix-react-sdk
-                      event: upstream-sdk-notify
 
         runs-on: ubuntu-latest
         steps:
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 057156a8b88..7e2bf0002cd 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -28,7 +28,7 @@ jobs:
         with:
             final: ${{ inputs.mode == 'final' }}
             npm: ${{ inputs.npm }}
-            downstreams: '["element-hq/matrix-react-sdk", "element-hq/element-web"]'
+            downstreams: '["element-hq/element-web"]'
 
     docs:
         name: Publish Documentation
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index 21316ded268..2c81d918a04 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -73,10 +73,10 @@ jobs:
             - if: needs.jest.result != 'skipped' && needs.jest.result != 'success'
               run: exit 1
 
-    matrix-react-sdk:
-        name: Downstream test matrix-react-sdk
+    element-web:
+        name: Downstream test element-web
         if: github.event_name == 'merge_group'
-        uses: element-hq/matrix-react-sdk/.github/workflows/tests.yml@develop
+        uses: element-hq/element-web/.github/workflows/tests.yml@develop
         with:
             disable_coverage: true
             matrix-js-sdk-sha: ${{ github.sha }}

From d56c2e8d7075d6b3a53a2a9d720ea3cde1aa1158 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Wed, 16 Oct 2024 10:07:25 +0100
Subject: [PATCH 2/2] Fix workflow

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 .github/workflows/tests.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index 2c81d918a04..ddca69bd3d5 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -106,7 +106,7 @@ jobs:
         runs-on: ubuntu-latest
         if: always()
         needs:
-            - matrix-react-sdk
+            - element-web
         steps:
             - name: Skip SonarCloud on merge queues
               if: env.ENABLE_COVERAGE == 'false'
@@ -119,5 +119,5 @@ jobs:
                   sha: ${{ github.sha }}
                   target_url: https://github.com/${{ github.repository }}/actions/runs/${{ github.run_id }}
 
-            - if: needs.matrix-react-sdk.result != 'skipped' && needs.matrix-react-sdk.result != 'success'
+            - if: needs.element-web.result != 'skipped' && needs.element-web.result != 'success'
               run: exit 1