Skip to content

Commit a7e6126

Browse files
committed
Merge tag 'v17.2.0' into sc
* Live location sharing: handle encrypted messages in processBeaconEvents ([\matrix-org#2327](matrix-org#2327)). * Fix race conditions around threads ([\matrix-org#2331](matrix-org#2331)). Fixes element-hq/element-web#21627. * Ignore m.replace relations on state events, they're invalid ([\matrix-org#2306](matrix-org#2306)). Fixes element-hq/element-web#21851. * fix example in readme ([\matrix-org#2315](matrix-org#2315)). * Don't decrement the length count of a thread when root redacted ([\matrix-org#2314](matrix-org#2314)). * Prevent attempt to create thread with id "undefined" ([\matrix-org#2308](matrix-org#2308)). * Update threads handling for replies-to-thread-responses as per MSC update ([\matrix-org#2305](matrix-org#2305)). Fixes element-hq/element-web#19678.
2 parents c696abf + e29ee10 commit a7e6126

Some content is hidden

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

42 files changed

+1559
-880
lines changed

.editorconfig

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,3 +21,6 @@ insert_final_newline = true
2121
indent_style = space
2222
indent_size = 4
2323
trim_trailing_whitespace = true
24+
25+
[*.{yml,yaml}]
26+
indent_size = 2

.github/codecov.yml

Lines changed: 0 additions & 12 deletions
This file was deleted.
Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
name: Notify Downstream Projects
2+
on:
3+
push:
4+
branches: [ develop ]
5+
jobs:
6+
notify-matrix-react-sdk:
7+
runs-on: ubuntu-latest
8+
steps:
9+
- name: Notify matrix-react-sdk repo that a new SDK build is on develop so it can CI against it
10+
uses: peter-evans/repository-dispatch@v1
11+
with:
12+
token: ${{ secrets.ELEMENT_BOT_TOKEN }}
13+
repository: vector-im/element-web
14+
event-type: upstream-sdk-notify

.github/workflows/preview_changelog.yaml

Lines changed: 0 additions & 12 deletions
This file was deleted.
Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
name: Pull Request
2+
on:
3+
pull_request_target:
4+
types: [ opened, edited, labeled, unlabeled ]
5+
jobs:
6+
changelog:
7+
name: Preview Changelog
8+
runs-on: ubuntu-latest
9+
steps:
10+
- uses: matrix-org/allchange@main
11+
with:
12+
ghToken: ${{ secrets.GITHUB_TOKEN }}
13+
14+
enforce-label:
15+
name: Enforce Labels
16+
runs-on: ubuntu-latest
17+
permissions:
18+
pull-requests: read
19+
steps:
20+
- uses: yogevbd/[email protected]
21+
with:
22+
REQUIRED_LABELS_ANY: "T-Defect,T-Deprecation,T-Enhancement,T-Task"
23+
BANNED_LABELS: "X-Blocked"
24+
BANNED_LABELS_DESCRIPTION: "Preventing merge whilst PR is marked blocked!"

.github/workflows/sonarqube.yml

Lines changed: 47 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,47 @@
1+
name: SonarQube
2+
on:
3+
workflow_run:
4+
workflows: [ "Tests" ]
5+
types:
6+
- completed
7+
jobs:
8+
sonarqube:
9+
name: SonarQube
10+
runs-on: ubuntu-latest
11+
if: github.event.workflow_run.conclusion == 'success'
12+
steps:
13+
- uses: actions/checkout@v2
14+
with:
15+
fetch-depth: 0 # Shallow clones should be disabled for a better relevancy of analysis
16+
17+
# There's a 'download artifact' action, but it hasn't been updated for the workflow_run action
18+
# (https://github.com/actions/download-artifact/issues/60) so instead we get this mess:
19+
- name: Download Coverage Report
20+
uses: actions/[email protected]
21+
with:
22+
script: |
23+
const artifacts = await github.actions.listWorkflowRunArtifacts({
24+
owner: context.repo.owner,
25+
repo: context.repo.repo,
26+
run_id: ${{ github.event.workflow_run.id }},
27+
});
28+
const matchArtifact = artifacts.data.artifacts.filter((artifact) => {
29+
return artifact.name == "coverage"
30+
})[0];
31+
const download = await github.actions.downloadArtifact({
32+
owner: context.repo.owner,
33+
repo: context.repo.repo,
34+
artifact_id: matchArtifact.id,
35+
archive_format: 'zip',
36+
});
37+
const fs = require('fs');
38+
fs.writeFileSync('${{github.workspace}}/coverage.zip', Buffer.from(download.data));
39+
40+
- name: Extract Coverage Report
41+
run: unzip -d coverage coverage.zip && rm coverage.zip
42+
43+
- name: SonarCloud Scan
44+
uses: SonarSource/sonarcloud-github-action@master
45+
env:
46+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} # Needed to get PR information, if any
47+
SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
Lines changed: 53 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,53 @@
1+
name: Static Analysis
2+
on:
3+
pull_request: { }
4+
push:
5+
branches: [ develop, master ]
6+
jobs:
7+
ts_lint:
8+
name: "Typescript Syntax Check"
9+
runs-on: ubuntu-latest
10+
steps:
11+
- uses: actions/checkout@v2
12+
13+
- uses: actions/setup-node@v3
14+
with:
15+
cache: 'yarn'
16+
17+
- name: Install Deps
18+
run: "yarn install"
19+
20+
- name: Typecheck
21+
run: "yarn run lint:types"
22+
23+
js_lint:
24+
name: "ESLint"
25+
runs-on: ubuntu-latest
26+
steps:
27+
- uses: actions/checkout@v2
28+
29+
- uses: actions/setup-node@v3
30+
with:
31+
cache: 'yarn'
32+
33+
- name: Install Deps
34+
run: "yarn install"
35+
36+
- name: Run Linter
37+
run: "yarn run lint:js"
38+
39+
docs:
40+
name: "JSDoc Checker"
41+
runs-on: ubuntu-latest
42+
steps:
43+
- uses: actions/checkout@v2
44+
45+
- uses: actions/setup-node@v3
46+
with:
47+
cache: 'yarn'
48+
49+
- name: Install Deps
50+
run: "yarn install"
51+
52+
- name: Generate Docs
53+
run: "yarn run gendoc"

.github/workflows/test_coverage.yml

Lines changed: 0 additions & 32 deletions
This file was deleted.

.github/workflows/tests.yml

Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
1+
name: Tests
2+
on:
3+
pull_request: { }
4+
push:
5+
branches: [ develop, main, master ]
6+
jobs:
7+
jest:
8+
name: Jest
9+
runs-on: ubuntu-latest
10+
steps:
11+
- name: Checkout code
12+
uses: actions/checkout@v2
13+
14+
- name: Yarn cache
15+
uses: actions/setup-node@v3
16+
with:
17+
cache: 'yarn'
18+
19+
- name: Install dependencies
20+
run: "yarn install"
21+
22+
- name: Build
23+
run: "yarn build"
24+
25+
- name: Run tests with coverage
26+
run: "yarn coverage --ci"
27+
28+
- name: Upload Artifact
29+
uses: actions/upload-artifact@v2
30+
with:
31+
name: coverage
32+
path: |
33+
coverage
34+
!coverage/lcov-report

CHANGELOG.md

Lines changed: 16 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,17 @@
1+
Changes in [17.2.0](https://github.com/matrix-org/matrix-js-sdk/releases/tag/v17.2.0) (2022-05-10)
2+
==================================================================================================
3+
4+
## ✨ Features
5+
* Live location sharing: handle encrypted messages in processBeaconEvents ([\#2327](https://github.com/matrix-org/matrix-js-sdk/pull/2327)).
6+
7+
## 🐛 Bug Fixes
8+
* Fix race conditions around threads ([\#2331](https://github.com/matrix-org/matrix-js-sdk/pull/2331)). Fixes vector-im/element-web#21627.
9+
* Ignore m.replace relations on state events, they're invalid ([\#2306](https://github.com/matrix-org/matrix-js-sdk/pull/2306)). Fixes vector-im/element-web#21851.
10+
* fix example in readme ([\#2315](https://github.com/matrix-org/matrix-js-sdk/pull/2315)).
11+
* Don't decrement the length count of a thread when root redacted ([\#2314](https://github.com/matrix-org/matrix-js-sdk/pull/2314)).
12+
* Prevent attempt to create thread with id "undefined" ([\#2308](https://github.com/matrix-org/matrix-js-sdk/pull/2308)).
13+
* Update threads handling for replies-to-thread-responses as per MSC update ([\#2305](https://github.com/matrix-org/matrix-js-sdk/pull/2305)). Fixes vector-im/element-web#19678.
14+
115
Changes in [17.1.0](https://github.com/matrix-org/matrix-js-sdk/releases/tag/v17.1.0) (2022-04-26)
216
==================================================================================================
317

@@ -684,7 +698,7 @@ Changes in [11.0.0-rc.1](https://github.com/matrix-org/matrix-js-sdk/releases/ta
684698
BREAKING CHANGES
685699
---
686700

687-
* `MatrixCall` and related APIs have been redesigned to support multiple streams
701+
* `MatrixCall` and related APIs have been redesigned to support multiple streams
688702
(see [\#1660](https://github.com/matrix-org/matrix-js-sdk/pull/1660) for more details)
689703

690704
All changes
@@ -1357,7 +1371,7 @@ BREAKING CHANGES
13571371
---
13581372

13591373
* `RoomState` events changed to use a Map instead of an object, which changes the collection APIs available to access them.
1360-
1374+
13611375
All Changes
13621376
---
13631377

0 commit comments

Comments
 (0)