Skip to content
This repository was archived by the owner on Sep 11, 2024. It is now read-only.

Commit 0a36af7

Browse files
committed
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/cr/72
2 parents 623212e + bb91df1 commit 0a36af7

File tree

118 files changed

+11126
-9259
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

118 files changed

+11126
-9259
lines changed

.github/workflows/cypress.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -142,7 +142,7 @@ jobs:
142142
run: |
143143
echo "sha=$(cat webapp/sha)" >> $GITHUB_OUTPUT
144144
145-
- uses: actions/checkout@v3
145+
- uses: actions/checkout@v4
146146
with:
147147
# XXX: We're checking out untrusted code in a secure context
148148
# We need to be careful to not trust anything this code outputs/may do
@@ -163,7 +163,7 @@ jobs:
163163
echo "CYPRESS_RUST_CRYPTO=1" >> "$GITHUB_ENV"
164164
165165
- name: Run Cypress tests
166-
uses: cypress-io/github-action@fa88e4afe551e64c8827a4b9e379afc63d8f691a
166+
uses: cypress-io/github-action@2558ee6af05072a19de2ce92cb68b38616132726
167167
with:
168168
working-directory: matrix-react-sdk
169169
# The built-in Electron runner seems to grind to a halt trying to run the tests, so use chrome.

.github/workflows/element-web.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ jobs:
4040
runs-on: ubuntu-latest
4141
steps:
4242
- name: Checkout code
43-
uses: actions/checkout@v3
43+
uses: actions/checkout@v4
4444
with:
4545
repository: ${{ inputs.react-sdk-repository || github.repository }}
4646

.github/workflows/i18n_check.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,12 @@ jobs:
77
permissions:
88
pull-requests: read
99
steps:
10-
- uses: actions/checkout@v3
10+
- uses: actions/checkout@v4
1111

1212
- name: "Get modified files"
1313
id: changed_files
1414
if: github.event_name == 'pull_request' && github.event.pull_request.user.login != 'RiotTranslateBot' && github.event.pull_request.user.login != 't3chguy'
15-
uses: tj-actions/changed-files@1c26215f3fbd51eba03bc199e5cbabdfc3584ce3 # v38
15+
uses: tj-actions/changed-files@48566bbcc22ceb7c5809ebdd27377309f2c3de8c # v39
1616
with:
1717
files: |
1818
src/i18n/strings/*

.github/workflows/netlify.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ jobs:
4141

4242
- name: ☁️ Deploy to Netlify
4343
id: netlify
44-
uses: nwtgck/actions-netlify@5da65c9f74c7961c5501a3ba329b8d0912f39c03 # v2.0
44+
uses: nwtgck/actions-netlify@7a92f00dde8c92a5a9e8385ec2919775f7647352 # v2.1
4545
with:
4646
publish-dir: webapp
4747
deploy-message: "Deploy from GitHub Actions"

.github/workflows/notify-element-web.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ jobs:
1212
if: github.repository == 'matrix-org/matrix-react-sdk'
1313
steps:
1414
- name: Notify element-web repo that a new SDK build is on develop
15-
uses: peter-evans/repository-dispatch@26b39ed245ab8f31526069329e112ab2fb224588 # v2
15+
uses: peter-evans/repository-dispatch@bf47d102fdb849e755b0b0023ea3e81a44b6f570 # v2
1616
with:
1717
token: ${{ secrets.ELEMENT_BOT_TOKEN }}
1818
repository: vector-im/element-web

.github/workflows/static_analysis.yaml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ jobs:
2020
name: "Typescript Syntax Check"
2121
runs-on: ubuntu-latest
2222
steps:
23-
- uses: actions/checkout@v3
23+
- uses: actions/checkout@v4
2424

2525
- uses: actions/setup-node@v3
2626
with:
@@ -61,7 +61,7 @@ jobs:
6161
name: "Rethemendex Check"
6262
runs-on: ubuntu-latest
6363
steps:
64-
- uses: actions/checkout@v3
64+
- uses: actions/checkout@v4
6565

6666
- run: ./res/css/rethemendex.sh
6767

@@ -71,7 +71,7 @@ jobs:
7171
name: "ESLint"
7272
runs-on: ubuntu-latest
7373
steps:
74-
- uses: actions/checkout@v3
74+
- uses: actions/checkout@v4
7575

7676
- uses: actions/setup-node@v3
7777
with:
@@ -88,7 +88,7 @@ jobs:
8888
name: "Style Lint"
8989
runs-on: ubuntu-latest
9090
steps:
91-
- uses: actions/checkout@v3
91+
- uses: actions/checkout@v4
9292

9393
- uses: actions/setup-node@v3
9494
with:
@@ -105,7 +105,7 @@ jobs:
105105
name: "Analyse Dead Code"
106106
runs-on: ubuntu-latest
107107
steps:
108-
- uses: actions/checkout@v3
108+
- uses: actions/checkout@v4
109109

110110
- uses: actions/setup-node@v3
111111
with:

.github/workflows/tests.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ jobs:
3232
runs-on: ubuntu-latest
3333
steps:
3434
- name: Checkout code
35-
uses: actions/checkout@v3
35+
uses: actions/checkout@v4
3636
with:
3737
repository: ${{ inputs.matrix-js-sdk-sha && 'matrix-org/matrix-react-sdk' || github.repository }}
3838

@@ -93,7 +93,7 @@ jobs:
9393
name: Element Web Integration Tests
9494
runs-on: ubuntu-latest
9595
steps:
96-
- uses: actions/checkout@v3
96+
- uses: actions/checkout@v4
9797
with:
9898
repository: ${{ inputs.matrix-js-sdk-sha && 'matrix-org/matrix-react-sdk' || github.repository }}
9999

cypress.config.ts

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,16 +15,29 @@ limitations under the License.
1515
*/
1616

1717
import { defineConfig } from "cypress";
18+
import * as fs from "node:fs";
1819

1920
export default defineConfig({
20-
videoUploadOnPasses: false,
21+
video: true,
2122
projectId: "ppvnzg",
2223
experimentalInteractiveRunEvents: true,
2324
experimentalMemoryManagement: true,
2425
defaultCommandTimeout: 10000,
2526
chromeWebSecurity: false,
2627
e2e: {
2728
setupNodeEvents(on, config) {
29+
// Delete videos of passing tests
30+
on("after:spec", (spec, results) => {
31+
if (results && results.video) {
32+
const failures = results.tests.some((test) =>
33+
test.attempts.some((attempt) => attempt.state === "failed"),
34+
);
35+
if (!failures) {
36+
fs.unlinkSync(results.video);
37+
}
38+
}
39+
});
40+
2841
return require("./cypress/plugins/index.ts").default(on, config);
2942
},
3043
baseUrl: "http://localhost:8080",

0 commit comments

Comments
 (0)