Add a feature flag to turn this off for newer versions of codeql

github · Oct 6, 2023 · 669c610 · 669c610
1 parent 028bacb
commit 669c610
Show file tree

Hide file tree

Showing 7 changed files with 18 additions and 9 deletions.
diff --git a/.github/workflows/python312-windows.yml b/.github/workflows/python312-windows.yml
@@ -30,7 +30,7 @@ jobs:
         version: default
 
     - name: Initialize CodeQL
-      uses: ./../init
+      uses: ./../action/init
       with:
         tools: latest
         languages: python

diff --git a/lib/init-action.js b/lib/init-action.js
diff --git a/lib/init-action.js.map b/lib/init-action.js.map
diff --git a/lib/init.js b/lib/init.js
diff --git a/lib/init.js.map b/lib/init.js.map
diff --git a/src/init-action.ts b/src/init-action.ts
@@ -283,7 +283,7 @@ async function run() {
       logger,
     );
 
-    await checkInstallPython311(config.languages);
+    await checkInstallPython311(config.languages, codeql);
 
     if (
       config.languages.includes(Language.python) &&

diff --git a/src/init.ts b/src/init.ts
@@ -186,8 +186,15 @@ function processError(e: any): Error {
  * If we are running python 3.12+ on windows, we need to switch to python 3.11.
  * This check happens in a powershell script.
  */
-export async function checkInstallPython311(languages: Language[]) {
-  if (languages.includes(Language.python) && process.platform === "win32") {
+export async function checkInstallPython311(
+  languages: Language[],
+  codeql: CodeQL,
+) {
+  if (
+    languages.includes(Language.python) &&
+    process.platform === "win32" &&
+    !(await codeql.getVersion()).features?.supportsPython312
+  ) {
     const script = path.resolve(
       __dirname,
       "../python-setup",