Skip to content

Commit 9341eca

Browse files
gabrc52gabrc52
committed
Merge tag 'v1.12.1' into sipb
Release v1.12.1
2 parents f4139d3 + 56b60e8 commit 9341eca

File tree

822 files changed

+18570
-9325
lines changed

Some content is hidden

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

822 files changed

+18570
-9325
lines changed

‎.github/CODEOWNERS‎

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,16 @@
1717
/playwright/e2e/crypto/ @element-hq/element-crypto-web-reviewers
1818
/playwright/e2e/settings/encryption-user-tab/ @element-hq/element-crypto-web-reviewers
1919

20+
21+
/src/models/Call.ts @element-hq/element-call-reviewers
22+
/src/call-types.ts @element-hq/element-call-reviewers
23+
/src/components/views/voip @element-hq/element-call-reviewers
24+
/playwright/e2e/voip/element-call.spec.ts @element-hq/element-call-reviewers
25+
2026
# Ignore translations as those will be updated by GHA for Localazy download
2127
/src/i18n/strings
2228
/src/i18n/strings/en_EN.json @element-hq/element-web-reviewers
23-
# Ignore the synapse plugin as this is updated by GHA for docker image updating
29+
# Ignore the synapse & mas plugins as this is updated by GHA for docker image updating
2430
/playwright/testcontainers/synapse.ts
31+
/playwright/testcontainers/mas.ts
2532

‎.github/PULL_REQUEST_TEMPLATE.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
## Checklist
44

5+
- [ ] I have read through [review guidelines](../docs/review.md) and [CONTRIBUTING.md](../CONTRIBUTING.md).
56
- [ ] Tests written for new code (and old code if feasible).
67
- [ ] New or updated `public`/`exported` symbols have accurate [TSDoc](https://tsdoc.org/) documentation.
78
- [ ] Linter and other CI checks pass.

‎.github/workflows/build.yml‎

Lines changed: 5 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,7 @@ concurrency:
1010
cancel-in-progress: ${{ github.event_name == 'pull_request' }}
1111
# develop pushes and repository_dispatch handled in build_develop.yaml
1212
env:
13-
# These must be set for fetchdep.sh to get the right branch
14-
REPOSITORY: ${{ github.repository }}
13+
# This must be set for fetchdep.sh to get the right branch
1514
PR_NUMBER: ${{ github.event.pull_request.number }}
1615
permissions: {} # No permissions required
1716
jobs:
@@ -43,9 +42,9 @@ jobs:
4342
run:
4443
shell: bash
4544
steps:
46-
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
45+
- uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5
4746

48-
- uses: actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020 # v4
47+
- uses: actions/setup-node@a0853c24544627f65ddf259abe73b1d18a591444 # v5
4948
with:
5049
# Disable cache on Windows as it is slower than not caching
5150
# https://github.com/actions/setup-node/issues/975
@@ -56,25 +55,15 @@ jobs:
5655
- run: yarn config set network-timeout 300000
5756

5857
- name: Fetch layered build
59-
id: layered_build
60-
env:
61-
# tell layered.sh to check out the right sha of the JS-SDK & EW, if they were given one
62-
JS_SDK_GITHUB_BASE_REF: ${{ inputs.matrix-js-sdk-sha }}
63-
run: |
64-
scripts/layered.sh
65-
JSSDK_SHA=$(git -C matrix-js-sdk rev-parse --short=12 HEAD)
66-
VECTOR_SHA=$(git rev-parse --short=12 HEAD)
67-
echo "VERSION=$VECTOR_SHA--js-$JSSDK_SHA" >> $GITHUB_OUTPUT
58+
run: ./scripts/layered.sh
6859

6960
- name: Copy config
7061
run: cp element.io/develop/config.json config.json
7162

7263
- name: Build
7364
env:
7465
CI_PACKAGE: true
75-
VERSION: "${{ steps.layered_build.outputs.VERSION }}"
76-
run: |
77-
yarn build
66+
run: VERSION=$(scripts/get-version-from-git.sh) yarn build
7867

7968
- name: Upload Artifact
8069
uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4

‎.github/workflows/build_debian.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ jobs:
1414
R2_URL: ${{ vars.CF_R2_S3_API }}
1515
VERSION: ${{ github.ref_name }}
1616
steps:
17-
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
17+
- uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5
1818

1919
- name: Download package
2020
run: |

‎.github/workflows/build_develop.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,9 @@ jobs:
2626
R2_URL: ${{ vars.CF_R2_S3_API }}
2727
R2_PUBLIC_URL: "https://element-web-develop.element.io"
2828
steps:
29-
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
29+
- uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5
3030

31-
- uses: actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020 # v4
31+
- uses: actions/setup-node@a0853c24544627f65ddf259abe73b1d18a591444 # v5
3232
with:
3333
cache: "yarn"
3434
node-version: "lts/*"

‎.github/workflows/deploy.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ jobs:
3434
env:
3535
SITE: ${{ inputs.site || 'staging.element.io' }}
3636
steps:
37-
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
37+
- uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5
3838

3939
- name: Load GPG key
4040
run: |

‎.github/workflows/docker.yaml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ jobs:
2020
env:
2121
TEST_TAG: vectorim/element-web:test
2222
steps:
23-
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
23+
- uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5
2424
with:
2525
fetch-depth: 0 # needed for docker-package to be able to calculate the version
2626

@@ -37,14 +37,14 @@ jobs:
3737
install: true
3838

3939
- name: Login to Docker Hub
40-
uses: docker/login-action@74a5d142397b4f367a81961eba4e8cd7edddf772 # v3
40+
uses: docker/login-action@184bdaa0721073962dff0199f1fb9940f07167d1 # v3
4141
if: github.event_name != 'pull_request'
4242
with:
4343
username: ${{ secrets.DOCKERHUB_USERNAME }}
4444
password: ${{ secrets.DOCKERHUB_TOKEN }}
4545

4646
- name: Login to GitHub Container Registry
47-
uses: docker/login-action@74a5d142397b4f367a81961eba4e8cd7edddf772 # v3
47+
uses: docker/login-action@184bdaa0721073962dff0199f1fb9940f07167d1 # v3
4848
if: github.event_name != 'pull_request'
4949
with:
5050
registry: ghcr.io
@@ -96,7 +96,7 @@ jobs:
9696
9797
- name: Docker meta
9898
id: meta
99-
uses: docker/metadata-action@902fa8ec7d6ecbf8d84d538b9b233a880e428804 # v5
99+
uses: docker/metadata-action@c1e51972afc2121e065aed6d45c65596fe445f3f # v5
100100
if: github.event_name != 'pull_request'
101101
with:
102102
images: |

‎.github/workflows/docs.yml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,23 +17,23 @@ jobs:
1717
runs-on: ubuntu-24.04
1818
steps:
1919
- name: Fetch element-desktop
20-
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
20+
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5
2121
with:
2222
repository: element-hq/element-desktop
2323
path: element-desktop
2424

2525
- name: Fetch element-web
26-
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
26+
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5
2727
with:
2828
path: element-web
2929

3030
- name: Fetch matrix-js-sdk
31-
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
31+
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5
3232
with:
3333
repository: matrix-org/matrix-js-sdk
3434
path: matrix-js-sdk
3535

36-
- uses: actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020 # v4
36+
- uses: actions/setup-node@a0853c24544627f65ddf259abe73b1d18a591444 # v5
3737
with:
3838
cache: "yarn"
3939
cache-dependency-path: element-web/yarn.lock
@@ -88,7 +88,7 @@ jobs:
8888
run: mdbook build
8989

9090
- name: Upload artifact
91-
uses: actions/upload-pages-artifact@56afc609e74202658d3ffba0e8f6dda462b719fa # v3
91+
uses: actions/upload-pages-artifact@7b1f4a764d45c48632c6b24a0339c27f5614fb0b # v4
9292
with:
9393
path: ./book
9494

‎.github/workflows/end-to-end-tests-netlify.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ jobs:
2525
actions: read
2626
steps:
2727
- name: Download HTML report
28-
uses: actions/download-artifact@d3f86a106a0bac45b974a628896c90dbdf5c8093 # v4
28+
uses: actions/download-artifact@634f93cb2916e3fdff6788551b99b062d0335ce0 # v5
2929
with:
3030
github-token: ${{ secrets.GITHUB_TOKEN }}
3131
run-id: ${{ github.event.workflow_run.id }}

‎.github/workflows/end-to-end-tests.yaml‎

Lines changed: 12 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -50,35 +50,28 @@ jobs:
5050
runners-matrix: ${{ steps.runner-vars.outputs.matrix }}
5151
steps:
5252
- name: Checkout code
53-
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
53+
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5
5454
with:
5555
repository: element-hq/element-web
5656

57-
- uses: actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020 # v4
57+
- uses: actions/setup-node@a0853c24544627f65ddf259abe73b1d18a591444 # v5
5858
with:
5959
cache: "yarn"
6060
node-version: "lts/*"
6161

6262
- name: Fetch layered build
63-
id: layered_build
6463
env:
6564
# tell layered.sh to check out the right sha of the JS-SDK & EW, if they were given one
6665
JS_SDK_GITHUB_BASE_REF: ${{ inputs.matrix-js-sdk-sha }}
67-
run: |
68-
scripts/layered.sh
69-
JSSDK_SHA=$(git -C matrix-js-sdk rev-parse --short=12 HEAD)
70-
VECTOR_SHA=$(git rev-parse --short=12 HEAD)
71-
echo "VERSION=$VECTOR_SHA--js-$JSSDK_SHA" >> $GITHUB_OUTPUT
66+
run: scripts/layered.sh
7267

7368
- name: Copy config
7469
run: cp element.io/develop/config.json config.json
7570

7671
- name: Build
7772
env:
7873
CI_PACKAGE: true
79-
VERSION: "${{ steps.layered_build.outputs.VERSION }}"
80-
run: |
81-
yarn build
74+
run: VERSION=$(scripts/get-version-from-git.sh) yarn build
8275

8376
- name: Upload Artifact
8477
uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4
@@ -89,7 +82,7 @@ jobs:
8982

9083
- name: Calculate runner variables
9184
id: runner-vars
92-
uses: actions/github-script@60a0d83039c74a4aee543508d2ffcb1c3799cdea # v7
85+
uses: actions/github-script@ed597411d8f924073f98dfc5c65a23a2325f34cd # v8
9386
with:
9487
script: |
9588
const numRunners = parseInt(process.env.NUM_RUNNERS, 10);
@@ -129,18 +122,18 @@ jobs:
129122
- runAllTests: false
130123
project: Pinecone
131124
steps:
132-
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
125+
- uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5
133126
with:
134127
persist-credentials: false
135128
repository: element-hq/element-web
136129

137130
- name: 📥 Download artifact
138-
uses: actions/download-artifact@d3f86a106a0bac45b974a628896c90dbdf5c8093 # v4
131+
uses: actions/download-artifact@634f93cb2916e3fdff6788551b99b062d0335ce0 # v5
139132
with:
140133
name: webapp
141134
path: webapp
142135

143-
- uses: actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020 # v4
136+
- uses: actions/setup-node@a0853c24544627f65ddf259abe73b1d18a591444 # v5
144137
with:
145138
cache: "yarn"
146139
cache-dependency-path: yarn.lock
@@ -154,7 +147,7 @@ jobs:
154147
run: echo "version=$(yarn list --pattern @playwright/test --depth=0 --json --non-interactive --no-progress | jq -r '.data.trees[].name')" >> $GITHUB_OUTPUT
155148

156149
- name: Cache playwright binaries
157-
uses: actions/cache@5a3ec84eff668545956fd18022155c47e93e2684 # v4
150+
uses: actions/cache@0400d5f644dc74513175e3cd8d07132dd4860809 # v4
158151
id: playwright-cache
159152
with:
160153
path: ~/.cache/ms-playwright
@@ -201,13 +194,13 @@ jobs:
201194
if: always()
202195
runs-on: ubuntu-24.04
203196
steps:
204-
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
197+
- uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5
205198
if: inputs.skip != true
206199
with:
207200
persist-credentials: false
208201
repository: element-hq/element-web
209202

210-
- uses: actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020 # v4
203+
- uses: actions/setup-node@a0853c24544627f65ddf259abe73b1d18a591444 # v5
211204
if: inputs.skip != true
212205
with:
213206
cache: "yarn"
@@ -219,7 +212,7 @@ jobs:
219212

220213
- name: Download blob reports from GitHub Actions Artifacts
221214
if: inputs.skip != true
222-
uses: actions/download-artifact@d3f86a106a0bac45b974a628896c90dbdf5c8093 # v4
215+
uses: actions/download-artifact@634f93cb2916e3fdff6788551b99b062d0335ce0 # v5
223216
with:
224217
pattern: all-blob-reports-*
225218
path: all-blob-reports

0 commit comments

Comments
 (0)