Skip to content

Commit d355073

Browse files
authored
Stop running react-sdk Cypress tests (#4008)
Signed-off-by: Michael Telatynski <[email protected]>
1 parent 2ef3ebb commit d355073

File tree

3 files changed

+6
-44
lines changed

3 files changed

+6
-44
lines changed

.github/workflows/downstream-artifacts.yml

+1-5
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,9 @@ on:
55

66
pull_request: {}
77

8-
# For now at least, we don't run this or the cypress-tests against pushes
8+
# For now at least, we don't run this or the downstream-end-to-end-tests against pushes
99
# to develop or master.
1010
#
11-
# Note that if we later choose to do so, we'll need to find a way to stop
12-
# the results in Cypress Cloud from clobbering those from the 'develop'
13-
# branch of matrix-react-sdk.
14-
#
1511
#push:
1612
# branches: [develop, master]
1713
concurrency:

.github/workflows/cypress.yml renamed to .github/workflows/downstream-end-to-end-tests.yml

+4-38
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# Triggers after the "Downstream artifacts" build has finished, to run the
2-
# matrix-react-sdk playwright & cypress tests (with access to repo secrets)
2+
# matrix-react-sdk playwright tests (with access to repo secrets)
33

44
name: matrix-react-sdk End to End Tests
55
on:
@@ -13,28 +13,6 @@ concurrency:
1313
cancel-in-progress: ${{ github.event.workflow_run.event == 'pull_request' }}
1414

1515
jobs:
16-
cypress:
17-
name: Cypress
18-
19-
# We only want to run the cypress tests on merge queue to prevent regressions
20-
# from creeping in. They take a long time to run and consume multiple concurrent runners.
21-
if: github.event.workflow_run.event == 'merge_group'
22-
23-
uses: matrix-org/matrix-react-sdk/.github/workflows/cypress.yaml@develop
24-
permissions:
25-
actions: read
26-
issues: read
27-
statuses: write
28-
pull-requests: read
29-
secrets:
30-
# secrets are not automatically shared with called workflows, so share the cypress dashboard key, and the Kiwi login details
31-
KNAPSACK_PRO_TEST_SUITE_TOKEN_CYPRESS_RUST: ${{ secrets.KNAPSACK_PRO_TEST_SUITE_TOKEN_CYPRESS_RUST}}
32-
KNAPSACK_PRO_TEST_SUITE_TOKEN_CYPRESS_LEGACY: ${{ secrets.KNAPSACK_PRO_TEST_SUITE_TOKEN_CYPRESS_LEGACY}}
33-
TCMS_USERNAME: ${{ secrets.TCMS_USERNAME }}
34-
TCMS_PASSWORD: ${{ secrets.TCMS_PASSWORD }}
35-
with:
36-
react-sdk-repository: matrix-org/matrix-react-sdk
37-
3816
playwright:
3917
name: Playwright
4018
# We only want to run the playwright tests on merge queue to prevent regressions
@@ -50,33 +28,21 @@ jobs:
5028
with:
5129
react-sdk-repository: matrix-org/matrix-react-sdk
5230

53-
# We want to make the cypress tests a required check for the merge queue.
31+
# We want to make the Playwright tests a required check for the merge queue.
5432
#
55-
# Unfortunately, github doesn't distinguish between "checks needed for branch
33+
# Unfortunately, GitHub doesn't distinguish between "checks needed for branch
5634
# protection" (ie, the things that must pass before the PR will even be added
5735
# to the merge queue) and "checks needed in the merge queue". We just have to add
5836
# the check to the branch protection list.
5937
#
60-
# Ergo, if we know we're not going to run the cypress tests, we need to add a
38+
# Ergo, if we know we're not going to run the Playwright tests, we need to add a
6139
# passing status check manually.
6240
mark_skipped:
6341
if: github.event.workflow_run.event != 'merge_group'
6442
permissions:
6543
statuses: write
6644
runs-on: ubuntu-latest
6745
steps:
68-
- uses: Sibz/github-status-action@071b5370da85afbb16637d6eed8524a06bc2053e # v1
69-
with:
70-
authToken: "${{ secrets.GITHUB_TOKEN }}"
71-
state: success
72-
description: Cypress skipped
73-
74-
# Keep in step with the `context` that is updated by `Sibz/github-status-action`
75-
# in matrix-org/matrix-react-sdk/.github/workflows/cypress.yaml.
76-
context: "${{ github.workflow }} / cypress"
77-
78-
sha: "${{ github.event.workflow_run.head_sha }}"
79-
8046
- uses: Sibz/github-status-action@071b5370da85afbb16637d6eed8524a06bc2053e # v1
8147
with:
8248
authToken: "${{ secrets.GITHUB_TOKEN }}"

.github/workflows/sonarcloud.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ jobs:
5353
github.event.workflow_run.conclusion == 'success'
5454
steps:
5555
# We create the status here and then update it to success/failure in the `report` stage
56-
# This provides an easy link to this workflow_run from the PR before Cypress is done.
56+
# This provides an easy link to this workflow_run from the PR before Sonarcloud is done.
5757
- uses: Sibz/github-status-action@071b5370da85afbb16637d6eed8524a06bc2053e # v1
5858
with:
5959
authToken: ${{ secrets.GITHUB_TOKEN }}

0 commit comments

Comments
 (0)