Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update matrix-appservice-bridge and use our own alias for matrix-bot-sdk #609

Merged
merged 5 commits into from
Oct 10, 2024
Merged

Update matrix-appservice-bridge and use our own alias for matrix-bot-sdk #609

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
030f880
Update matrix-appservice-bridge and use our own alias for matrix-bot-sdk
MTRNord Oct 10, 2024
ce28b0f
Bump node version to support matrix-appservice-bridge
MTRNord Oct 10, 2024
7d61512
Bump node version in CI
MTRNord Oct 10, 2024
a268470
Fix comments
MTRNord Oct 10, 2024
1a1ebf9
Add changelog entry
MTRNord Oct 10, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions .github/workflows/mjolnir.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,10 +21,10 @@ jobs:
steps:
- uses: actions/checkout@v4

- name: Specifically use node 18 like in the readme.
- name: Specifically use node 20 like in the readme.
uses: actions/setup-node@v4
with:
node-version: "18"
node-version: "20"
- run: corepack enable
- run: corepack yarn install
- run: corepack yarn build
Expand All @@ -34,10 +34,10 @@ jobs:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- name: Specifically use node 18 like in the readme.
- name: Specifically use node 20 like in the readme.
uses: actions/setup-node@v4
with:
node-version: "18"
node-version: "20"
- run: corepack yarn install
- run: corepack yarn test:unit
integration:
Expand All @@ -48,7 +48,7 @@ jobs:
- uses: actions/checkout@v4
- uses: actions/setup-node@v4
with:
node-version: "18"
node-version: "20"
- name: Fetch and build mx-tester (cached across runs)
uses: baptiste0928/cargo-install@v3
with:
Expand All @@ -70,7 +70,7 @@ jobs:
- uses: actions/checkout@v4
- uses: actions/setup-node@v4
with:
node-version: "18"
node-version: "20"
- name: Fetch and build mx-tester (cached across runs)
uses: baptiste0928/cargo-install@v3
with:
Expand Down
5 changes: 3 additions & 2 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,8 @@
"humanize-duration-ts": "^2.1.1",
"js-yaml": "^4.1.0",
"jsdom": "^24.0.0",
"matrix-appservice-bridge": "^9.0.1",
"matrix-appservice-bridge": "^10.3.1",
"matrix-bot-sdk": "npm:@vector-im/matrix-bot-sdk",
"matrix-protection-suite": "npm:@gnuxie/[email protected]",
"matrix-protection-suite-for-matrix-bot-sdk": "npm:@gnuxie/[email protected]",
"parse-duration": "^1.0.2",
Expand All @@ -82,7 +83,7 @@
"@vector-im/matrix-bot-sdk": "npm:@vector-im/matrix-bot-sdk@^0.6.6-element.1"
},
"engines": {
"node": ">=18.0.0"
"node": ">=20.0.0"
MTRNord marked this conversation as resolved.
Show resolved Hide resolved
},
"packageManager": "[email protected]+sha1.ac34549e6aa8e7ead463a7407e1c7390f61a6610"
}
3 changes: 2 additions & 1 deletion src/utils.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -416,7 +416,8 @@ function patchMatrixClientForConciseExceptions() {
if (isMatrixError(path)) {
const matrixError = new MatrixError(
body as MatrixError["body"],
err.statusCode as number
err.statusCode as number,
err.headers as Record<string, string>
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

interesting that they changed this

);
if (error.stack !== undefined) {
matrixError.stack = error.stack;
Expand Down
Loading
Loading