Merge branch 'main' into redsun82/kotlin

redsun82 · redsun82 · commit b8c063ed2a7e · 2024-04-12T08:19:14.000+02:00
diff --git a/docs/codeql/reusables/supported-platforms.rst b/docs/codeql/reusables/supported-platforms.rst
@@ -20,7 +20,11 @@
 
    macOS 12 Monterey
 
-   macOS 13 Ventura","x86-64
+   macOS 13 Ventura
+
+   macOS 14 Sonoma","x86-64
+
+   x86-64, arm64 (Apple Silicon)
 
    x86-64, arm64 (Apple Silicon)
 
diff --git a/python/extractor/buildtools/version.py b/python/extractor/buildtools/version.py
@@ -18,12 +18,12 @@
 
 WIN = sys.platform == "win32"
 
-
-if WIN:
+if WIN and "CODEQL_EXTRACTOR_PYTHON_OPTION_PYTHON_EXECUTABLE_NAME" not in os.environ:
     # installing `py` launcher is optional when installing Python on windows, so it's
     # possible that the user did not install it, see
     # https://github.com/github/codeql-cli-binaries/issues/125#issuecomment-1157429430
-    # so we check whether it has been installed. Newer versions have a `--list` option,
+    # so we check whether it has been installed, and we check only if the "python_executable_name"
+    # extractor option has not been specified. Newer versions have a `--list` option,
     # but that has only been mentioned in the docs since 3.9, so to not risk it not
     # working on potential older versions, we'll just use `py --version` which forwards
     # the `--version` argument to the default python executable.
