diff --git a/CHANGELOG.md b/CHANGELOG.md index 5599f87c47..97ccfc58b7 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -9,7 +9,12 @@ * Add pause/resume API in `DataProducer` and `DataConsumer` ([PR #1104](https://github.com/versatica/mediasoup/pull/1104)). * DataChannel subchannels feature ([PR #1152](https://github.com/versatica/mediasoup/pull/1152)). * `Worker`: Make DTLS fragment stay within MTU size range ([PR #1156](https://github.com/versatica/mediasoup/pull/1156), based on [PR #1143](https://github.com/versatica/mediasoup/pull/1143) by @vpnts-se). + + +### 3.12.14 + * CI: Use Node.js version 20 ([PR #1177](https://github.com/versatica/mediasoup/pull/1177)). +* Use given `PYTHON` environment variable (if given) when running `worker/scripts/getmake.py` ([PR #1186](https://github.com/versatica/mediasoup/pull/1186)). ### 3.12.13 diff --git a/npm-scripts.mjs b/npm-scripts.mjs index a390672051..6ca1442f5b 100644 --- a/npm-scripts.mjs +++ b/npm-scripts.mjs @@ -474,21 +474,34 @@ function installMsysMake() { logInfo('installMsysMake()'); - let res = spawnSync('where', [ 'python3.exe' ]); + let pythonPath; - if (res.status !== 0) + // If PYTHON environment variable is given, use it. + if (process.env.PYTHON) { - res = spawnSync('where', [ 'python.exe' ]); + pythonPath = process.env.PYTHON; + } + // Otherwise ensure python3.exe is available in the PATH. + else + { + let res = spawnSync('where', [ 'python3.exe' ]); if (res.status !== 0) { - logError('`installMsysMake() | cannot find Python executable'); + res = spawnSync('where', [ 'python.exe' ]); - exitWithError(); + if (res.status !== 0) + { + logError('`installMsysMake() | cannot find Python executable'); + + exitWithError(); + } } + + pythonPath = String(res.stdout).trim(); } - executeCmd(`${String(res.stdout).trim()} worker\\scripts\\getmake.py`); + executeCmd(`${pythonPath} worker\\scripts\\getmake.py`); } function ensureDir(dir) diff --git a/package-lock.json b/package-lock.json index 1ae6c05ed9..454166c872 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "mediasoup", - "version": "3.12.13", + "version": "3.12.14", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "mediasoup", - "version": "3.12.13", + "version": "3.12.14", "hasInstallScript": true, "license": "ISC", "dependencies": { @@ -23,7 +23,7 @@ "@types/debug": "^4.1.10", "@types/jest": "^29.5.6", "@types/node": "^20.8.7", - "@types/uuid": "^9.0.5", + "@types/uuid": "^9.0.6", "@typescript-eslint/eslint-plugin": "^6.8.0", "@typescript-eslint/parser": "^6.8.0", "eslint": "^8.51.0", @@ -1648,9 +1648,9 @@ "dev": true }, "node_modules/@types/uuid": { - "version": "9.0.5", - "resolved": "https://registry.npmjs.org/@types/uuid/-/uuid-9.0.5.tgz", - "integrity": "sha512-xfHdwa1FMJ082prjSJpoEI57GZITiQz10r3vEJCHa2khEFQjKy91aWKz6+zybzssCvXUwE1LQWgWVwZ4nYUvHQ==", + "version": "9.0.6", + "resolved": "https://registry.npmjs.org/@types/uuid/-/uuid-9.0.6.tgz", + "integrity": "sha512-BT2Krtx4xaO6iwzwMFUYvWBWkV2pr37zD68Vmp1CDV196MzczBRxuEpD6Pr395HAgebC/co7hOphs53r8V7jew==", "dev": true }, "node_modules/@types/yargs": { @@ -8046,9 +8046,9 @@ "dev": true }, "@types/uuid": { - "version": "9.0.5", - "resolved": "https://registry.npmjs.org/@types/uuid/-/uuid-9.0.5.tgz", - "integrity": "sha512-xfHdwa1FMJ082prjSJpoEI57GZITiQz10r3vEJCHa2khEFQjKy91aWKz6+zybzssCvXUwE1LQWgWVwZ4nYUvHQ==", + "version": "9.0.6", + "resolved": "https://registry.npmjs.org/@types/uuid/-/uuid-9.0.6.tgz", + "integrity": "sha512-BT2Krtx4xaO6iwzwMFUYvWBWkV2pr37zD68Vmp1CDV196MzczBRxuEpD6Pr395HAgebC/co7hOphs53r8V7jew==", "dev": true }, "@types/yargs": { diff --git a/package.json b/package.json index 84535a57a5..ccb51ffb30 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "mediasoup", - "version": "3.12.13", + "version": "3.12.14", "description": "Cutting Edge WebRTC Video Conferencing", "contributors": [ "IƱaki Baz Castillo (https://inakibaz.me)", @@ -108,7 +108,7 @@ "@types/debug": "^4.1.10", "@types/jest": "^29.5.6", "@types/node": "^20.8.7", - "@types/uuid": "^9.0.5", + "@types/uuid": "^9.0.6", "@typescript-eslint/eslint-plugin": "^6.8.0", "@typescript-eslint/parser": "^6.8.0", "eslint": "^8.51.0",