robojerk/codeql-action

Remove redundant code based on CLI version number

Browse source
This commit is contained in:
Henry Mercer 2025-05-30 17:07:44 +01:00
parent fb70a8a3d6
commit 0be24c0c9a
3 changed files with 5 additions and 40 deletions
Download patch file Download diff file Expand all files Collapse all files

17
lib/init-action.js generated
View file

@ -377,25 +377,12 @@ async function run() {
if ((0, caching_utils_1.shouldRestoreCache)(config.dependencyCachingEnabled)) { if ((0, caching_utils_1.shouldRestoreCache)(config.dependencyCachingEnabled)) {
await (0, dependency_caching_1.downloadDependencyCaches)(config.languages, logger); await (0, dependency_caching_1.downloadDependencyCaches)(config.languages, logger);
} }
// For CLI versions <2.15.1, build tracing caused errors in macOS ARM machines with // Suppress warnings about disabled Python library extraction.
// System Integrity Protection (SIP) disabled.
if (!(await (0, util_1.codeQlVersionAtLeast)(codeql, "2.15.1")) &&
process.platform === "darwin" &&
(process.arch === "arm" || process.arch === "arm64") &&
!(await (0, util_1.checkSipEnablement)(logger))) {
logger.warning("CodeQL versions 2.15.0 and lower are not supported on macOS ARM machines with System Integrity Protection (SIP) disabled.");
}
// From 2.16.0 the default for the python extractor is to not perform any
// dependency extraction. For versions before that, you needed to set this flag to
// enable this behavior.
if (await (0, util_1.codeQlVersionAtLeast)(codeql, "2.17.1")) { if (await (0, util_1.codeQlVersionAtLeast)(codeql, "2.17.1")) {
// disabled by default, no warning // disabled by default, no warning
} }
else if (await (0, util_1.codeQlVersionAtLeast)(codeql, "2.16.0")) {
// disabled by default, prints warning if environment variable is not set
core.exportVariable("CODEQL_EXTRACTOR_PYTHON_DISABLE_LIBRARY_EXTRACTION", "true");
}
else { else {
// disabled by default, prints warning if environment variable is not set
core.exportVariable("CODEQL_EXTRACTOR_PYTHON_DISABLE_LIBRARY_EXTRACTION", "true"); core.exportVariable("CODEQL_EXTRACTOR_PYTHON_DISABLE_LIBRARY_EXTRACTION", "true");
} }
if ((0, actions_util_1.getOptionalInput)("setup-python-dependencies") !== undefined) { if ((0, actions_util_1.getOptionalInput)("setup-python-dependencies") !== undefined) {

2
lib/init-action.js.map
View file

File diff suppressed because one or more lines are too long

26
src/init-action.ts
View file

@ -60,7 +60,6 @@ import {
checkDiskUsage, checkDiskUsage,
checkForTimeout, checkForTimeout,
checkGitHubVersionInRange, checkGitHubVersionInRange,
checkSipEnablement,
codeQlVersionAtLeast, codeQlVersionAtLeast,
DEFAULT_DEBUG_ARTIFACT_NAME, DEFAULT_DEBUG_ARTIFACT_NAME,
DEFAULT_DEBUG_DATABASE_NAME, DEFAULT_DEBUG_DATABASE_NAME,
@ -623,32 +622,11 @@ async function run() {
await downloadDependencyCaches(config.languages, logger); await downloadDependencyCaches(config.languages, logger);
} }
// For CLI versions <2.15.1, build tracing caused errors in macOS ARM machines with // Suppress warnings about disabled Python library extraction.
// System Integrity Protection (SIP) disabled.
if (
!(await codeQlVersionAtLeast(codeql, "2.15.1")) &&
process.platform === "darwin" &&
(process.arch === "arm" || process.arch === "arm64") &&
!(await checkSipEnablement(logger))
) {
logger.warning(
"CodeQL versions 2.15.0 and lower are not supported on macOS ARM machines with System Integrity Protection (SIP) disabled.",
);
}
// From 2.16.0 the default for the python extractor is to not perform any
// dependency extraction. For versions before that, you needed to set this flag to
// enable this behavior.
if (await codeQlVersionAtLeast(codeql, "2.17.1")) { if (await codeQlVersionAtLeast(codeql, "2.17.1")) {
// disabled by default, no warning // disabled by default, no warning
} else if (await codeQlVersionAtLeast(codeql, "2.16.0")) {
// disabled by default, prints warning if environment variable is not set
core.exportVariable(
"CODEQL_EXTRACTOR_PYTHON_DISABLE_LIBRARY_EXTRACTION",
"true",
);
} else { } else {
// disabled by default, prints warning if environment variable is not set
core.exportVariable( core.exportVariable(
"CODEQL_EXTRACTOR_PYTHON_DISABLE_LIBRARY_EXTRACTION", "CODEQL_EXTRACTOR_PYTHON_DISABLE_LIBRARY_EXTRACTION",
"true", "true",