From 522c1579cf3174f435028743757d8733cf7a3a8f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?I=C3=B1aki=20Baz=20Castillo?= Date: Sun, 4 Aug 2024 19:17:17 +0200 Subject: [PATCH 1/2] Support Node 22 --- .github/workflows/mediasoup-node.yaml | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/.github/workflows/mediasoup-node.yaml b/.github/workflows/mediasoup-node.yaml index c98d7e74f5..915b62ebf2 100644 --- a/.github/workflows/mediasoup-node.yaml +++ b/.github/workflows/mediasoup-node.yaml @@ -17,21 +17,27 @@ jobs: node: 18 - os: ubuntu-22.04 node: 20 + - os: ubuntu-22.04 + node: 22 - os: ubuntu-24.04 - node: 20 + node: 22 meson_args: '-Db_sanitize=address' - os: ubuntu-24.04 - node: 20 + node: 22 meson_args: '-Db_sanitize=undefined' - os: ubuntu-24.04 - node: 20 + node: 22 meson_args: '-Db_sanitize=thread' - os: macos-12 node: 18 - os: macos-14 node: 20 + - os: macos-14 + node: 22 - os: windows-2022 node: 20 + - os: windows-2022 + node: 22 build-type: - Release - Debug From e7a29aa48fa3439f21f4d1d196fcdca28b870a7f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?I=C3=B1aki=20Baz=20Castillo?= Date: Sun, 4 Aug 2024 19:45:33 +0200 Subject: [PATCH 2/2] Use node 22 as default --- .../workflows/mediasoup-worker-prebuild.yaml | 2 +- .github/workflows/mediasoup-worker.yaml | 2 +- CHANGELOG.md | 2 ++ package-lock.json | 34 ++++++++++--------- package.json | 2 +- 5 files changed, 23 insertions(+), 19 deletions(-) diff --git a/.github/workflows/mediasoup-worker-prebuild.yaml b/.github/workflows/mediasoup-worker-prebuild.yaml index 762361367b..e0c458a903 100644 --- a/.github/workflows/mediasoup-worker-prebuild.yaml +++ b/.github/workflows/mediasoup-worker-prebuild.yaml @@ -32,7 +32,7 @@ jobs: cc: cl cxx: cl node: - - 20 + - 22 runs-on: ${{ matrix.build.os }} diff --git a/.github/workflows/mediasoup-worker.yaml b/.github/workflows/mediasoup-worker.yaml index 9fb3c68b72..b9522d2215 100644 --- a/.github/workflows/mediasoup-worker.yaml +++ b/.github/workflows/mediasoup-worker.yaml @@ -42,7 +42,7 @@ jobs: cxx: cl # A single Node.js version should be fine for C++. node: - - 20 + - 22 build-type: - Release - Debug diff --git a/CHANGELOG.md b/CHANGELOG.md index 8e87d51a3f..e937d97a5f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,8 @@ ### NEXT +- CI: Support Node 22 ([PR #1434](https://github.com/versatica/mediasoup/pull/1434)). + ### 3.14.9 - Worker: Test, fix buffer overflow ([PR #1419](https://github.com/versatica/mediasoup/pull/1419)). diff --git a/package-lock.json b/package-lock.json index 7352d3c4f7..6e37d19f61 100644 --- a/package-lock.json +++ b/package-lock.json @@ -23,7 +23,7 @@ "@octokit/rest": "^21.0.1", "@types/debug": "^4.1.12", "@types/jest": "^29.5.12", - "@types/node": "^20.14.12", + "@types/node": "^22.1.0", "@typescript-eslint/eslint-plugin": "^7.17.0", "@typescript-eslint/parser": "^7.17.0", "eslint": "^8.57.0", @@ -1803,12 +1803,13 @@ "integrity": "sha512-iiUgKzV9AuaEkZqkOLDIvlQiL6ltuZd9tGcW3gwpnX8JbuiuhFlEGmmFXEXkN50Cvq7Os88IY2v0dkDqXYWVgA==" }, "node_modules/@types/node": { - "version": "20.14.12", - "resolved": "https://registry.npmjs.org/@types/node/-/node-20.14.12.tgz", - "integrity": "sha512-r7wNXakLeSsGT0H1AU863vS2wa5wBOK4bWMjZz2wj+8nBx+m5PeIn0k8AloSLpRuiwdRQZwarZqHE4FNArPuJQ==", + "version": "22.1.0", + "resolved": "https://registry.npmjs.org/@types/node/-/node-22.1.0.tgz", + "integrity": "sha512-AOmuRF0R2/5j1knA3c6G3HOk523Ga+l+ZXltX8SF1+5oqcXijjfTd8fY3XRZqSihEu9XhtQnKYLmkFaoxgsJHw==", "dev": true, + "license": "MIT", "dependencies": { - "undici-types": "~5.26.4" + "undici-types": "~6.13.0" } }, "node_modules/@types/stack-utils": { @@ -6044,10 +6045,11 @@ } }, "node_modules/undici-types": { - "version": "5.26.5", - "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-5.26.5.tgz", - "integrity": "sha512-JlCMO+ehdEIKqlFxk6IfVoAUVmgz7cU7zD/h9XZ0qzeosSHmUJVOzSQvvYSYWXkFXC+IfLKSIffhv0sVZup6pA==", - "dev": true + "version": "6.13.0", + "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-6.13.0.tgz", + "integrity": "sha512-xtFJHudx8S2DSoujjMd1WeWvn7KKWFRESZTMeL1RptAYERu29D6jphMjjY+vn96jvN3kVPDNxU/E13VTaXj6jg==", + "dev": true, + "license": "MIT" }, "node_modules/unique-string": { "version": "3.0.0", @@ -7644,12 +7646,12 @@ "integrity": "sha512-iiUgKzV9AuaEkZqkOLDIvlQiL6ltuZd9tGcW3gwpnX8JbuiuhFlEGmmFXEXkN50Cvq7Os88IY2v0dkDqXYWVgA==" }, "@types/node": { - "version": "20.14.12", - "resolved": "https://registry.npmjs.org/@types/node/-/node-20.14.12.tgz", - "integrity": "sha512-r7wNXakLeSsGT0H1AU863vS2wa5wBOK4bWMjZz2wj+8nBx+m5PeIn0k8AloSLpRuiwdRQZwarZqHE4FNArPuJQ==", + "version": "22.1.0", + "resolved": "https://registry.npmjs.org/@types/node/-/node-22.1.0.tgz", + "integrity": "sha512-AOmuRF0R2/5j1knA3c6G3HOk523Ga+l+ZXltX8SF1+5oqcXijjfTd8fY3XRZqSihEu9XhtQnKYLmkFaoxgsJHw==", "dev": true, "requires": { - "undici-types": "~5.26.4" + "undici-types": "~6.13.0" } }, "@types/stack-utils": { @@ -10573,9 +10575,9 @@ "dev": true }, "undici-types": { - "version": "5.26.5", - "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-5.26.5.tgz", - "integrity": "sha512-JlCMO+ehdEIKqlFxk6IfVoAUVmgz7cU7zD/h9XZ0qzeosSHmUJVOzSQvvYSYWXkFXC+IfLKSIffhv0sVZup6pA==", + "version": "6.13.0", + "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-6.13.0.tgz", + "integrity": "sha512-xtFJHudx8S2DSoujjMd1WeWvn7KKWFRESZTMeL1RptAYERu29D6jphMjjY+vn96jvN3kVPDNxU/E13VTaXj6jg==", "dev": true }, "unique-string": { diff --git a/package.json b/package.json index 4010187354..35437050aa 100644 --- a/package.json +++ b/package.json @@ -112,7 +112,7 @@ "@octokit/rest": "^21.0.1", "@types/debug": "^4.1.12", "@types/jest": "^29.5.12", - "@types/node": "^20.14.12", + "@types/node": "^22.1.0", "@typescript-eslint/eslint-plugin": "^7.17.0", "@typescript-eslint/parser": "^7.17.0", "eslint": "^8.57.0",