Skip to content

Commit f17f2a4

Browse files
authored
Merge branch 'element-hq:main' into main
2 parents 754c0d8 + 47fc7c9 commit f17f2a4

File tree

111 files changed

+1030
-1585
lines changed

Some content is hidden

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

111 files changed

+1030
-1585
lines changed

.config/nextest.toml

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,2 @@
1-
[test-groups]
2-
database = { max-threads = 1 }
3-
41
[profile.default]
52
retries = 1
6-
7-
# sqlx has a problem with nextest, as it uses a process-local semaphore to have
8-
# tests use different databases. This doesn't work with nextest, as it has a
9-
# process-per-test model, which is why we need to make sure only one test uses
10-
# the database at a time.
11-
# See https://github.com/launchbadge/sqlx/pull/3334
12-
[[profile.default.overrides]]
13-
filter = 'package(mas-handlers) or package(mas-storage-pg)'
14-
test-group = 'database'

.github/workflows/build.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -340,7 +340,7 @@ jobs:
340340
uses: actions/[email protected]
341341

342342
- name: Install Node
343-
uses: actions/setup-node@v4.3.0
343+
uses: actions/setup-node@v4.4.0
344344
with:
345345
node-version-file: ./tools/syn2mas/.nvmrc
346346

.github/workflows/ci.yaml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ jobs:
5858
uses: actions/[email protected]
5959

6060
- name: Install Node
61-
uses: actions/setup-node@v4.3.0
61+
uses: actions/setup-node@v4.4.0
6262
with:
6363
node-version: 22
6464

@@ -82,7 +82,7 @@ jobs:
8282
uses: actions/[email protected]
8383

8484
- name: Install Node
85-
uses: actions/setup-node@v4.3.0
85+
uses: actions/setup-node@v4.4.0
8686
with:
8787
node-version: 22
8888

@@ -106,7 +106,7 @@ jobs:
106106
uses: actions/[email protected]
107107

108108
- name: Install Node
109-
uses: actions/setup-node@v4.3.0
109+
uses: actions/setup-node@v4.4.0
110110
with:
111111
node-version: 20
112112

@@ -323,7 +323,7 @@ jobs:
323323
uses: actions/[email protected]
324324

325325
- name: Install Node
326-
uses: actions/setup-node@v4.3.0
326+
uses: actions/setup-node@v4.4.0
327327
with:
328328
node-version-file: ./tools/syn2mas/.nvmrc
329329

.github/workflows/docs.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ jobs:
3434
tool: mdbook
3535

3636
- name: Install Node
37-
uses: actions/setup-node@v4.3.0
37+
uses: actions/setup-node@v4.4.0
3838
with:
3939
node-version: 22
4040

.github/workflows/release-branch.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ jobs:
4848
uses: actions/[email protected]
4949

5050
- name: Install Node
51-
uses: actions/setup-node@v4.3.0
51+
uses: actions/setup-node@v4.4.0
5252
with:
5353
node-version: 22
5454

.github/workflows/translations-download.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ jobs:
1717
uses: actions/[email protected]
1818

1919
- name: Install Node
20-
uses: actions/setup-node@v4.3.0
20+
uses: actions/setup-node@v4.4.0
2121
with:
2222
node-version: 22
2323

.github/workflows/translations-upload.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ jobs:
1616
uses: actions/[email protected]
1717

1818
- name: Install Node
19-
uses: actions/setup-node@v4.3.0
19+
uses: actions/setup-node@v4.4.0
2020
with:
2121
node-version: 22
2222

0 commit comments

Comments
 (0)