Merge branch 'develop' into florianduros/threads/labs-flag

.github/CODEOWNERS

@@ -1,5 +1,14 @@
-*                         @matrix-org/element-web
-/.github/workflows/**     @matrix-org/element-web-app-team
-/package.json             @matrix-org/element-web-app-team
-/yarn.lock                @matrix-org/element-web-app-team
+*                         @matrix-org/element-web-reviewers
+/.github/workflows/**     @matrix-org/element-web-team
+/package.json             @matrix-org/element-web-team
+/yarn.lock                @matrix-org/element-web-team
+
+/src/SecurityManager.ts                           @matrix-org/element-crypto-web-reviewers
+/test/SecurityManager-test.ts                     @matrix-org/element-crypto-web-reviewers
+/src/async-components/views/dialogs/security/     @matrix-org/element-crypto-web-reviewers
+/src/components/views/dialogs/security/           @matrix-org/element-crypto-web-reviewers
+/test/components/views/dialogs/security/          @matrix-org/element-crypto-web-reviewers
+/src/stores/SetupEncryptionStore.ts               @matrix-org/element-crypto-web-reviewers
+/test/stores/SetupEncryptionStore-test.ts         @matrix-org/element-crypto-web-reviewers
+
 /src/i18n/strings

.github/workflows/sonarqube.yml

@@ -10,7 +10,9 @@ concurrency:
 jobs:
     sonarqube:
         name: 🩻 SonarQube
-        if: github.event.workflow_run.event != 'merge_group'
+        if: github.event.workflow_run.conclusion == 'success' && github.event.workflow_run.event != 'merge_group'
         uses: matrix-org/matrix-js-sdk/.github/workflows/sonarcloud.yml@develop
         secrets:
             SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
+        with:
+            sharded: true

.github/workflows/tests.yml

@@ -30,6 +30,11 @@ jobs:
     jest:
         name: Jest
         runs-on: ubuntu-latest
+        strategy:
+            fail-fast: false
+            matrix:
+                # Run multiple instances in parallel to speed up the tests
+                runner: [1, 2]
         steps:
             - name: Checkout code
               uses: actions/checkout@v4
@@ -62,7 +67,17 @@ jobs:
                       --coverage=${{ env.ENABLE_COVERAGE }} \
                       --ci \
                       --max-workers ${{ steps.cpu-cores.outputs.count }} \
+                      --shard ${{ matrix.runner }}/${{ strategy.job-total }} \
                       --cacheDirectory /tmp/jest_cache
+              env:
+                  JEST_SONAR_UNIQUE_OUTPUT_NAME: true
+
+                  # tell jest to use coloured output
+                  FORCE_COLOR: true
+
+            - name: Move coverage files into place
+              if: env.ENABLE_COVERAGE == 'true'
+              run: mv coverage/lcov.info coverage/${{ steps.setupNode.outputs.node-version }}-${{ matrix.runner }}.lcov.info
 
             - name: Upload Artifact
               if: env.ENABLE_COVERAGE == 'true'

CHANGELOG.md

@@ -1,3 +1,9 @@
+Changes in [3.88.0](https://github.com/matrix-org/matrix-react-sdk/releases/tag/v3.88.0) (2024-01-04)
+=====================================================================================================
+## 🐛 Bug Fixes
+
+* Fix a fresh login creating a new key backup ([#12106](https://github.com/matrix-org/matrix-react-sdk/pull/12106)).
+
 Changes in [3.87.0](https://github.com/matrix-org/matrix-react-sdk/releases/tag/v3.87.0) (2023-12-19)
 =====================================================================================================
 ## ✨ Features

cypress/e2e/dummy.spec.ts

@@ -0,0 +1,19 @@
+/*
+Copyright 2024 The Matrix.org Foundation C.I.C.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+/// <reference types="cypress" />
+
+it("Dummy test to make CI pass", () => {});