Merge branch 'v3' into fix-ice-server-crash

CHANGELOG.md

@@ -1,12 +1,17 @@
 # Changelog
 
 
-### NEXT
+### Next
 
-* CI: Use Node.js version 20 ([PR #1177](https://github.com/versatica/mediasoup/pull/1177)).
 * Fix `IceServer` crash when client uses ICE renomination ([PR #1182](https://github.com/versatica/mediasoup/pull/1182)).
 
 
+### 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
 
 * Bump up Meson from 1.1.0 to 1.2.1 (fixes Xcode 15 build issues) ([PR #1163](https://github.com/versatica/mediasoup/pull/1163) by @arcinston).

npm-scripts.mjs

@@ -418,21 +418,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)

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 <[email protected]> (https://inakibaz.me)",
@@ -99,7 +99,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",