Merge branch 'develop' into germain-gg/fix-right-panel-member

matrix-org · Sep 7, 2023 · 159deec · 159deec
2 parents 4e6148d + d19a0e0
commit 159deec
Show file tree

Hide file tree

Showing 156 changed files with 17,319 additions and 14,279 deletions.
diff --git a/.github/workflows/cypress.yaml b/.github/workflows/cypress.yaml
@@ -118,8 +118,8 @@ jobs:
         strategy:
             fail-fast: false
             matrix:
-                # Run 4 instances in Parallel
-                runner: [1, 2, 3, 4]
+                # Naive segmentation of tests
+                segment: ["a-i", "j-p", "q-s", "t-z"]
         steps:
             - uses: browser-actions/setup-chrome@c485fa3bab6be59dce18dbc18ef6ab7cbc8ff5f1
             - run: echo "BROWSER_PATH=$(which chrome)" >> $GITHUB_ENV
@@ -142,7 +142,7 @@ jobs:
               run: |
                   echo "sha=$(cat webapp/sha)" >> $GITHUB_OUTPUT
 
-            - uses: actions/checkout@v3
+            - uses: actions/checkout@v4
               with:
                   # XXX: We're checking out untrusted code in a secure context
                   # We need to be careful to not trust anything this code outputs/may do
@@ -172,10 +172,11 @@ jobs:
                   start: npx serve -p 8080 -L ../webapp
                   wait-on: "http://localhost:8080"
                   record: true
-                  parallel: true
+                  parallel: false
                   command-prefix: "yarn percy exec --parallel --"
                   config: '{"reporter":"cypress-multi-reporters", "reporterOptions": { "configFile": "cypress-ci-reporter-config.json" } }'
                   ci-build-id: ${{ needs.prepare.outputs.uuid }}
+                  spec: cypress/e2e/[${{ matrix.segment }}]*/**
               env:
                   # pass the Dashboard record key as an environment variable
                   CYPRESS_RECORD_KEY: ${{ secrets.CYPRESS_RECORD_KEY }}

diff --git a/.github/workflows/element-web.yaml b/.github/workflows/element-web.yaml
@@ -40,7 +40,7 @@ jobs:
         runs-on: ubuntu-latest
         steps:
             - name: Checkout code
-              uses: actions/checkout@v3
+              uses: actions/checkout@v4
               with:
                   repository: ${{ inputs.react-sdk-repository || github.repository }}
 

diff --git a/.github/workflows/i18n_check.yml b/.github/workflows/i18n_check.yml
@@ -7,7 +7,7 @@ jobs:
         permissions:
             pull-requests: read
         steps:
-            - uses: actions/checkout@v3
+            - uses: actions/checkout@v4
 
             - name: "Get modified files"
               id: changed_files

diff --git a/.github/workflows/static_analysis.yaml b/.github/workflows/static_analysis.yaml
@@ -20,7 +20,7 @@ jobs:
         name: "Typescript Syntax Check"
         runs-on: ubuntu-latest
         steps:
-            - uses: actions/checkout@v3
+            - uses: actions/checkout@v4
 
             - uses: actions/setup-node@v3
               with:
@@ -61,7 +61,7 @@ jobs:
         name: "Rethemendex Check"
         runs-on: ubuntu-latest
         steps:
-            - uses: actions/checkout@v3
+            - uses: actions/checkout@v4
 
             - run: ./res/css/rethemendex.sh
 
@@ -71,7 +71,7 @@ jobs:
         name: "ESLint"
         runs-on: ubuntu-latest
         steps:
-            - uses: actions/checkout@v3
+            - uses: actions/checkout@v4
 
             - uses: actions/setup-node@v3
               with:
@@ -88,7 +88,7 @@ jobs:
         name: "Style Lint"
         runs-on: ubuntu-latest
         steps:
-            - uses: actions/checkout@v3
+            - uses: actions/checkout@v4
 
             - uses: actions/setup-node@v3
               with:
@@ -105,7 +105,7 @@ jobs:
         name: "Analyse Dead Code"
         runs-on: ubuntu-latest
         steps:
-            - uses: actions/checkout@v3
+            - uses: actions/checkout@v4
 
             - uses: actions/setup-node@v3
               with:

diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -32,7 +32,7 @@ jobs:
         runs-on: ubuntu-latest
         steps:
             - name: Checkout code
-              uses: actions/checkout@v3
+              uses: actions/checkout@v4
               with:
                   repository: ${{ inputs.matrix-js-sdk-sha && 'matrix-org/matrix-react-sdk' || github.repository }}
 
@@ -93,7 +93,7 @@ jobs:
         name: Element Web Integration Tests
         runs-on: ubuntu-latest
         steps:
-            - uses: actions/checkout@v3
+            - uses: actions/checkout@v4
               with:
                   repository: ${{ inputs.matrix-js-sdk-sha && 'matrix-org/matrix-react-sdk' || github.repository }}
 

diff --git a/README.md b/README.md
@@ -209,7 +209,5 @@ Now the yarn commands should work as normal.
 
 ### End-to-End tests
 
-Make sure you've got your Element development server running (by doing `yarn
-start` in element-web), and then in this project, run `yarn run test:cypress`. See
-[`docs/cypress.md`](https://github.com/matrix-org/matrix-react-sdk/blob/develop/docs/cypress.md)
-for more information.
+We use Cypress and Element Web for end-to-end tests. See
+[`docs/cypress.md`](docs/cypress.md) for more information.