Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
11 changes: 5 additions & 6 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -60,17 +60,16 @@ jobs:
fail-fast: true
matrix:
# Use Ubuntu LTS-1 for broader glibc compatibility.
os: [ubuntu-22.04]
node-version: [22.0, 24.0]
os: [ubuntu-22.04, macos-latest]
node-version: [24.0, 25.0]
include:
- os: ubuntu-22.04
os-name: 🐧

- os: macos-latest
os-name: 🍏
node-version: 22.0

- node-version: 22.0
- node-version: 24.0
build-doc: true

steps:
Expand All @@ -85,7 +84,7 @@ jobs:
rustup default stable

- name: Load cache
uses: Swatinem/rust-cache@779680da715d629ac1d338a641029a2f4372abb5 # v2.8.2
uses: Swatinem/rust-cache@c19371144df3bb44fab255c43d04cbc2ab54d1c4 # v2.9.1
with:
save-if: ${{ github.ref == 'refs/heads/main' }}

Expand Down Expand Up @@ -153,7 +152,7 @@ jobs:
node-version-file: .node-version

- name: Load cache
uses: Swatinem/rust-cache@779680da715d629ac1d338a641029a2f4372abb5 # v2.8.2
uses: Swatinem/rust-cache@c19371144df3bb44fab255c43d04cbc2ab54d1c4 # v2.9.1
with:
save-if: ${{ github.ref == 'refs/heads/main' }}

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -159,7 +159,7 @@ jobs:
- name: Install Node.js
uses: actions/setup-node@53b83947a5a98c8d113130e565377fae1a50d02f # v6.3.0
with:
node-version: 22
node-version-file: .node-version
registry-url: https://registry.npmjs.org/
scope: '@matrix-org'
cache: ""
Expand Down
2 changes: 1 addition & 1 deletion .node-version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
22
24
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

## UNRELEASED

- Support Node.JS 25, drop support for 22. [#68](https://github.com/matrix-org/matrix-rust-sdk-crypto-nodejs/pull/68)
- `OlmMachine.bootstrap_cross_signing` now returns the requests required to
upload the cross-signing keys to the server. [#67](https://github.com/matrix-org/matrix-rust-sdk-crypto-nodejs/pull/67)
- Add new functions `OlmMachine.export_secrets_for_secret_storage` and
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@ Page](https://nodejs.org/en/about/releases/), _and_ which are
compatible with [NAPI v6 (Node.js
API)](https://nodejs.org/api/n-api.html#node-api-version-matrix). It
means that this binding will work with the following versions:
22.0.0 and 24.0.0.
24.0.0 and 25.0.0.

Once the Rust compiler, Node.js and npm are installed, you can run the
following commands:
Expand Down
74 changes: 42 additions & 32 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
"yargs-parser": "~21.1.1"
},
"engines": {
"node": ">= 22"
"node": ">= 24"
},
"scripts": {
"lint": "prettier --check .",
Expand Down
Loading