diff --git a/src/analyze.ts b/src/analyze.ts index 12cf67068..9ba8cff79 100644 --- a/src/analyze.ts +++ b/src/analyze.ts @@ -105,14 +105,14 @@ async function setupPythonExtractor( } if ( - await features.getValue( + (await features.getValue( Feature.DisablePythonDependencyInstallationEnabled, codeql, - ) || - await features.getValue( + )) || + (await features.getValue( Feature.PythonDefaultIsToSkipDependencyInstallationEnabled, codeql, - ) + )) ) { logger.warning( "We recommend that you remove the CODEQL_PYTHON environment variable from your workflow. This environment variable was originally used to specify a Python executable that included the dependencies of your Python code, however Python analysis no longer uses these dependencies." + diff --git a/src/init-action.ts b/src/init-action.ts index ec0c0edb6..6e6496c11 100644 --- a/src/init-action.ts +++ b/src/init-action.ts @@ -294,14 +294,14 @@ async function run() { getRequiredInput("setup-python-dependencies") === "true" ) { if ( - await features.getValue( + (await features.getValue( Feature.DisablePythonDependencyInstallationEnabled, codeql, - ) || - await features.getValue( + )) || + (await features.getValue( Feature.PythonDefaultIsToSkipDependencyInstallationEnabled, codeql, - ) + )) ) { logger.info("Skipping python dependency installation"); } else { @@ -451,14 +451,14 @@ async function run() { // Disable Python dependency extraction if feature flag set if ( - await features.getValue( + (await features.getValue( Feature.DisablePythonDependencyInstallationEnabled, codeql, - ) || - await features.getValue( + )) || + (await features.getValue( Feature.PythonDefaultIsToSkipDependencyInstallationEnabled, codeql, - ) + )) ) { core.exportVariable( "CODEQL_EXTRACTOR_PYTHON_DISABLE_LIBRARY_EXTRACTION",