From 0c3c20ece1672fdac1a53e1818686836e6ae9ef2 Mon Sep 17 00:00:00 2001 From: "Michael B. Gale" Date: Tue, 9 Apr 2024 14:06:24 +0100 Subject: [PATCH 1/2] Docs: Add macOS 14 to list of supported operating systems --- docs/codeql/reusables/supported-platforms.rst | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/docs/codeql/reusables/supported-platforms.rst b/docs/codeql/reusables/supported-platforms.rst index aaa3c9c2584..bc9e0a40c38 100644 --- 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) From e33c5706f8a6b486e171b0b3264e949c67f813f9 Mon Sep 17 00:00:00 2001 From: Sid Shankar Date: Thu, 11 Apr 2024 12:59:41 -0400 Subject: [PATCH 2/2] Modifies check for py launcher This commit modifies the check for the "py" launcher on windows. We now look for the launcher only if the python_executable_name extractor option is not specified. --- python/extractor/buildtools/version.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/python/extractor/buildtools/version.py b/python/extractor/buildtools/version.py index e6f685a64b1..9098ee5ab20 100644 --- a/python/extractor/buildtools/version.py +++ b/python/extractor/buildtools/version.py @@ -18,12 +18,12 @@ else: 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.