diff --git a/lib/analyze-action-post.js b/lib/analyze-action-post.js index b2805a67e4..2dd4d601dd 100644 --- a/lib/analyze-action-post.js +++ b/lib/analyze-action-post.js @@ -120181,14 +120181,14 @@ var featureConfig = { envVar: "CODEQL_ACTION_OVERLAY_ANALYSIS_RUST", minimumVersion: void 0 }, - ["overlay_analysis_swift" /* OverlayAnalysisSwift */]: { + ["overlay_analysis_skip_resource_checks" /* OverlayAnalysisSkipResourceChecks */]: { defaultValue: false, - envVar: "CODEQL_ACTION_OVERLAY_ANALYSIS_SWIFT", + envVar: "CODEQL_ACTION_OVERLAY_ANALYSIS_SKIP_RESOURCE_CHECKS", minimumVersion: void 0 }, - ["overlay_analysis_skip_resource_checks" /* OverlayAnalysisSkipResourceChecks */]: { + ["overlay_analysis_swift" /* OverlayAnalysisSwift */]: { defaultValue: false, - envVar: "CODEQL_ACTION_OVERLAY_ANALYSIS_SKIP_RESOURCE_CHECKS", + envVar: "CODEQL_ACTION_OVERLAY_ANALYSIS_SWIFT", minimumVersion: void 0 }, ["python_default_is_to_not_extract_stdlib" /* PythonDefaultIsToNotExtractStdlib */]: { @@ -120226,6 +120226,7 @@ var actionsCache2 = __toESM(require_cache3()); // src/config-utils.ts var OVERLAY_MINIMUM_AVAILABLE_DISK_SPACE_MB = 2e4; var OVERLAY_MINIMUM_AVAILABLE_DISK_SPACE_BYTES = OVERLAY_MINIMUM_AVAILABLE_DISK_SPACE_MB * 1e6; +var OVERLAY_MINIMUM_MEMORY_MB = 5 * 1024; var OVERLAY_ANALYSIS_FEATURES = { actions: "overlay_analysis_actions" /* OverlayAnalysisActions */, cpp: "overlay_analysis_cpp" /* OverlayAnalysisCpp */, diff --git a/lib/analyze-action.js b/lib/analyze-action.js index 754af3b143..1ee89a8320 100644 --- a/lib/analyze-action.js +++ b/lib/analyze-action.js @@ -87093,7 +87093,7 @@ function getCgroupMemoryLimitBytes(limitFile, logger) { ); return limit; } -function getMemoryFlagValue(userInput, logger) { +function getCodeQLMemoryLimit(userInput, logger) { return getMemoryFlagValueForPlatform( userInput, getTotalMemoryBytes(logger), @@ -87101,7 +87101,7 @@ function getMemoryFlagValue(userInput, logger) { ); } function getMemoryFlag(userInput, logger) { - const megabytes = getMemoryFlagValue(userInput, logger); + const megabytes = getCodeQLMemoryLimit(userInput, logger); return `--ram=${megabytes}`; } function getThreadsFlagValue(userInput, logger) { @@ -88802,14 +88802,14 @@ var featureConfig = { envVar: "CODEQL_ACTION_OVERLAY_ANALYSIS_RUST", minimumVersion: void 0 }, - ["overlay_analysis_swift" /* OverlayAnalysisSwift */]: { + ["overlay_analysis_skip_resource_checks" /* OverlayAnalysisSkipResourceChecks */]: { defaultValue: false, - envVar: "CODEQL_ACTION_OVERLAY_ANALYSIS_SWIFT", + envVar: "CODEQL_ACTION_OVERLAY_ANALYSIS_SKIP_RESOURCE_CHECKS", minimumVersion: void 0 }, - ["overlay_analysis_skip_resource_checks" /* OverlayAnalysisSkipResourceChecks */]: { + ["overlay_analysis_swift" /* OverlayAnalysisSwift */]: { defaultValue: false, - envVar: "CODEQL_ACTION_OVERLAY_ANALYSIS_SKIP_RESOURCE_CHECKS", + envVar: "CODEQL_ACTION_OVERLAY_ANALYSIS_SWIFT", minimumVersion: void 0 }, ["python_default_is_to_not_extract_stdlib" /* PythonDefaultIsToNotExtractStdlib */]: { @@ -89385,6 +89385,7 @@ async function cachePrefix(codeql, language) { // src/config-utils.ts var OVERLAY_MINIMUM_AVAILABLE_DISK_SPACE_MB = 2e4; var OVERLAY_MINIMUM_AVAILABLE_DISK_SPACE_BYTES = OVERLAY_MINIMUM_AVAILABLE_DISK_SPACE_MB * 1e6; +var OVERLAY_MINIMUM_MEMORY_MB = 5 * 1024; var OVERLAY_ANALYSIS_FEATURES = { actions: "overlay_analysis_actions" /* OverlayAnalysisActions */, cpp: "overlay_analysis_cpp" /* OverlayAnalysisCpp */, diff --git a/lib/autobuild-action.js b/lib/autobuild-action.js index 2bfd694d00..520a42f6a9 100644 --- a/lib/autobuild-action.js +++ b/lib/autobuild-action.js @@ -84121,14 +84121,14 @@ var featureConfig = { envVar: "CODEQL_ACTION_OVERLAY_ANALYSIS_RUST", minimumVersion: void 0 }, - ["overlay_analysis_swift" /* OverlayAnalysisSwift */]: { + ["overlay_analysis_skip_resource_checks" /* OverlayAnalysisSkipResourceChecks */]: { defaultValue: false, - envVar: "CODEQL_ACTION_OVERLAY_ANALYSIS_SWIFT", + envVar: "CODEQL_ACTION_OVERLAY_ANALYSIS_SKIP_RESOURCE_CHECKS", minimumVersion: void 0 }, - ["overlay_analysis_skip_resource_checks" /* OverlayAnalysisSkipResourceChecks */]: { + ["overlay_analysis_swift" /* OverlayAnalysisSwift */]: { defaultValue: false, - envVar: "CODEQL_ACTION_OVERLAY_ANALYSIS_SKIP_RESOURCE_CHECKS", + envVar: "CODEQL_ACTION_OVERLAY_ANALYSIS_SWIFT", minimumVersion: void 0 }, ["python_default_is_to_not_extract_stdlib" /* PythonDefaultIsToNotExtractStdlib */]: { @@ -84431,6 +84431,7 @@ var actionsCache2 = __toESM(require_cache3()); // src/config-utils.ts var OVERLAY_MINIMUM_AVAILABLE_DISK_SPACE_MB = 2e4; var OVERLAY_MINIMUM_AVAILABLE_DISK_SPACE_BYTES = OVERLAY_MINIMUM_AVAILABLE_DISK_SPACE_MB * 1e6; +var OVERLAY_MINIMUM_MEMORY_MB = 5 * 1024; var OVERLAY_ANALYSIS_FEATURES = { actions: "overlay_analysis_actions" /* OverlayAnalysisActions */, cpp: "overlay_analysis_cpp" /* OverlayAnalysisCpp */, diff --git a/lib/init-action-post.js b/lib/init-action-post.js index c1df2926ad..841e2eaabc 100644 --- a/lib/init-action-post.js +++ b/lib/init-action-post.js @@ -123562,14 +123562,14 @@ var featureConfig = { envVar: "CODEQL_ACTION_OVERLAY_ANALYSIS_RUST", minimumVersion: void 0 }, - ["overlay_analysis_swift" /* OverlayAnalysisSwift */]: { + ["overlay_analysis_skip_resource_checks" /* OverlayAnalysisSkipResourceChecks */]: { defaultValue: false, - envVar: "CODEQL_ACTION_OVERLAY_ANALYSIS_SWIFT", + envVar: "CODEQL_ACTION_OVERLAY_ANALYSIS_SKIP_RESOURCE_CHECKS", minimumVersion: void 0 }, - ["overlay_analysis_skip_resource_checks" /* OverlayAnalysisSkipResourceChecks */]: { + ["overlay_analysis_swift" /* OverlayAnalysisSwift */]: { defaultValue: false, - envVar: "CODEQL_ACTION_OVERLAY_ANALYSIS_SKIP_RESOURCE_CHECKS", + envVar: "CODEQL_ACTION_OVERLAY_ANALYSIS_SWIFT", minimumVersion: void 0 }, ["python_default_is_to_not_extract_stdlib" /* PythonDefaultIsToNotExtractStdlib */]: { @@ -123890,6 +123890,7 @@ var actionsCache2 = __toESM(require_cache3()); // src/config-utils.ts var OVERLAY_MINIMUM_AVAILABLE_DISK_SPACE_MB = 2e4; var OVERLAY_MINIMUM_AVAILABLE_DISK_SPACE_BYTES = OVERLAY_MINIMUM_AVAILABLE_DISK_SPACE_MB * 1e6; +var OVERLAY_MINIMUM_MEMORY_MB = 5 * 1024; var OVERLAY_ANALYSIS_FEATURES = { actions: "overlay_analysis_actions" /* OverlayAnalysisActions */, cpp: "overlay_analysis_cpp" /* OverlayAnalysisCpp */, diff --git a/lib/init-action.js b/lib/init-action.js index 3502f6d2f3..05ee04747a 100644 --- a/lib/init-action.js +++ b/lib/init-action.js @@ -84396,7 +84396,7 @@ function getCgroupMemoryLimitBytes(limitFile, logger) { ); return limit; } -function getMemoryFlagValue(userInput, logger) { +function getCodeQLMemoryLimit(userInput, logger) { return getMemoryFlagValueForPlatform( userInput, getTotalMemoryBytes(logger), @@ -86216,14 +86216,14 @@ var featureConfig = { envVar: "CODEQL_ACTION_OVERLAY_ANALYSIS_RUST", minimumVersion: void 0 }, - ["overlay_analysis_swift" /* OverlayAnalysisSwift */]: { + ["overlay_analysis_skip_resource_checks" /* OverlayAnalysisSkipResourceChecks */]: { defaultValue: false, - envVar: "CODEQL_ACTION_OVERLAY_ANALYSIS_SWIFT", + envVar: "CODEQL_ACTION_OVERLAY_ANALYSIS_SKIP_RESOURCE_CHECKS", minimumVersion: void 0 }, - ["overlay_analysis_skip_resource_checks" /* OverlayAnalysisSkipResourceChecks */]: { + ["overlay_analysis_swift" /* OverlayAnalysisSwift */]: { defaultValue: false, - envVar: "CODEQL_ACTION_OVERLAY_ANALYSIS_SKIP_RESOURCE_CHECKS", + envVar: "CODEQL_ACTION_OVERLAY_ANALYSIS_SWIFT", minimumVersion: void 0 }, ["python_default_is_to_not_extract_stdlib" /* PythonDefaultIsToNotExtractStdlib */]: { @@ -86668,6 +86668,7 @@ async function cachePrefix(codeql, language) { // src/config-utils.ts var OVERLAY_MINIMUM_AVAILABLE_DISK_SPACE_MB = 2e4; var OVERLAY_MINIMUM_AVAILABLE_DISK_SPACE_BYTES = OVERLAY_MINIMUM_AVAILABLE_DISK_SPACE_MB * 1e6; +var OVERLAY_MINIMUM_MEMORY_MB = 5 * 1024; async function getSupportedLanguageMap(codeql, logger) { const resolveSupportedLanguagesUsingCli = await codeql.supportsFeature( "builtinExtractorsSpecifyDefaultQueries" /* BuiltinExtractorsSpecifyDefaultQueries */ @@ -86934,8 +86935,8 @@ async function runnerSupportsOverlayAnalysis(ramInput, logger) { ); return false; } - const memoryFlagValue = getMemoryFlagValue(ramInput, logger); - if (memoryFlagValue < 5 * 1024) { + const memoryFlagValue = getCodeQLMemoryLimit(ramInput, logger); + if (memoryFlagValue < OVERLAY_MINIMUM_MEMORY_MB) { logger.info( `Setting overlay database mode to ${"none" /* None */} due to insufficient memory for CodeQL analysis (${memoryFlagValue} MB).` ); @@ -90175,7 +90176,7 @@ exec ${goBinaryPath} "$@"` } core13.exportVariable( "CODEQL_RAM", - process.env["CODEQL_RAM"] || getMemoryFlagValue(getOptionalInput("ram"), logger).toString() + process.env["CODEQL_RAM"] || getCodeQLMemoryLimit(getOptionalInput("ram"), logger).toString() ); core13.exportVariable( "CODEQL_THREADS", diff --git a/lib/resolve-environment-action.js b/lib/resolve-environment-action.js index 026a771192..4eee8e6ca3 100644 --- a/lib/resolve-environment-action.js +++ b/lib/resolve-environment-action.js @@ -84112,14 +84112,14 @@ var featureConfig = { envVar: "CODEQL_ACTION_OVERLAY_ANALYSIS_RUST", minimumVersion: void 0 }, - ["overlay_analysis_swift" /* OverlayAnalysisSwift */]: { + ["overlay_analysis_skip_resource_checks" /* OverlayAnalysisSkipResourceChecks */]: { defaultValue: false, - envVar: "CODEQL_ACTION_OVERLAY_ANALYSIS_SWIFT", + envVar: "CODEQL_ACTION_OVERLAY_ANALYSIS_SKIP_RESOURCE_CHECKS", minimumVersion: void 0 }, - ["overlay_analysis_skip_resource_checks" /* OverlayAnalysisSkipResourceChecks */]: { + ["overlay_analysis_swift" /* OverlayAnalysisSwift */]: { defaultValue: false, - envVar: "CODEQL_ACTION_OVERLAY_ANALYSIS_SKIP_RESOURCE_CHECKS", + envVar: "CODEQL_ACTION_OVERLAY_ANALYSIS_SWIFT", minimumVersion: void 0 }, ["python_default_is_to_not_extract_stdlib" /* PythonDefaultIsToNotExtractStdlib */]: { @@ -84157,6 +84157,7 @@ var actionsCache2 = __toESM(require_cache3()); // src/config-utils.ts var OVERLAY_MINIMUM_AVAILABLE_DISK_SPACE_MB = 2e4; var OVERLAY_MINIMUM_AVAILABLE_DISK_SPACE_BYTES = OVERLAY_MINIMUM_AVAILABLE_DISK_SPACE_MB * 1e6; +var OVERLAY_MINIMUM_MEMORY_MB = 5 * 1024; var OVERLAY_ANALYSIS_FEATURES = { actions: "overlay_analysis_actions" /* OverlayAnalysisActions */, cpp: "overlay_analysis_cpp" /* OverlayAnalysisCpp */, diff --git a/lib/setup-codeql-action.js b/lib/setup-codeql-action.js index 6f8fbea44b..019d53e311 100644 --- a/lib/setup-codeql-action.js +++ b/lib/setup-codeql-action.js @@ -84024,14 +84024,14 @@ var featureConfig = { envVar: "CODEQL_ACTION_OVERLAY_ANALYSIS_RUST", minimumVersion: void 0 }, - ["overlay_analysis_swift" /* OverlayAnalysisSwift */]: { + ["overlay_analysis_skip_resource_checks" /* OverlayAnalysisSkipResourceChecks */]: { defaultValue: false, - envVar: "CODEQL_ACTION_OVERLAY_ANALYSIS_SWIFT", + envVar: "CODEQL_ACTION_OVERLAY_ANALYSIS_SKIP_RESOURCE_CHECKS", minimumVersion: void 0 }, - ["overlay_analysis_skip_resource_checks" /* OverlayAnalysisSkipResourceChecks */]: { + ["overlay_analysis_swift" /* OverlayAnalysisSwift */]: { defaultValue: false, - envVar: "CODEQL_ACTION_OVERLAY_ANALYSIS_SKIP_RESOURCE_CHECKS", + envVar: "CODEQL_ACTION_OVERLAY_ANALYSIS_SWIFT", minimumVersion: void 0 }, ["python_default_is_to_not_extract_stdlib" /* PythonDefaultIsToNotExtractStdlib */]: { @@ -84602,6 +84602,7 @@ var actionsCache2 = __toESM(require_cache3()); // src/config-utils.ts var OVERLAY_MINIMUM_AVAILABLE_DISK_SPACE_MB = 2e4; var OVERLAY_MINIMUM_AVAILABLE_DISK_SPACE_BYTES = OVERLAY_MINIMUM_AVAILABLE_DISK_SPACE_MB * 1e6; +var OVERLAY_MINIMUM_MEMORY_MB = 5 * 1024; var OVERLAY_ANALYSIS_FEATURES = { actions: "overlay_analysis_actions" /* OverlayAnalysisActions */, cpp: "overlay_analysis_cpp" /* OverlayAnalysisCpp */, diff --git a/lib/start-proxy-action-post.js b/lib/start-proxy-action-post.js index 85f560379d..95c4a1ffd5 100644 --- a/lib/start-proxy-action-post.js +++ b/lib/start-proxy-action-post.js @@ -119587,14 +119587,14 @@ var featureConfig = { envVar: "CODEQL_ACTION_OVERLAY_ANALYSIS_RUST", minimumVersion: void 0 }, - ["overlay_analysis_swift" /* OverlayAnalysisSwift */]: { + ["overlay_analysis_skip_resource_checks" /* OverlayAnalysisSkipResourceChecks */]: { defaultValue: false, - envVar: "CODEQL_ACTION_OVERLAY_ANALYSIS_SWIFT", + envVar: "CODEQL_ACTION_OVERLAY_ANALYSIS_SKIP_RESOURCE_CHECKS", minimumVersion: void 0 }, - ["overlay_analysis_skip_resource_checks" /* OverlayAnalysisSkipResourceChecks */]: { + ["overlay_analysis_swift" /* OverlayAnalysisSwift */]: { defaultValue: false, - envVar: "CODEQL_ACTION_OVERLAY_ANALYSIS_SKIP_RESOURCE_CHECKS", + envVar: "CODEQL_ACTION_OVERLAY_ANALYSIS_SWIFT", minimumVersion: void 0 }, ["python_default_is_to_not_extract_stdlib" /* PythonDefaultIsToNotExtractStdlib */]: { @@ -119632,6 +119632,7 @@ var actionsCache2 = __toESM(require_cache3()); // src/config-utils.ts var OVERLAY_MINIMUM_AVAILABLE_DISK_SPACE_MB = 2e4; var OVERLAY_MINIMUM_AVAILABLE_DISK_SPACE_BYTES = OVERLAY_MINIMUM_AVAILABLE_DISK_SPACE_MB * 1e6; +var OVERLAY_MINIMUM_MEMORY_MB = 5 * 1024; var OVERLAY_ANALYSIS_FEATURES = { actions: "overlay_analysis_actions" /* OverlayAnalysisActions */, cpp: "overlay_analysis_cpp" /* OverlayAnalysisCpp */, diff --git a/lib/start-proxy-action.js b/lib/start-proxy-action.js index 264b95c3a0..271c38e7ec 100644 --- a/lib/start-proxy-action.js +++ b/lib/start-proxy-action.js @@ -100176,14 +100176,14 @@ var featureConfig = { envVar: "CODEQL_ACTION_OVERLAY_ANALYSIS_RUST", minimumVersion: void 0 }, - ["overlay_analysis_swift" /* OverlayAnalysisSwift */]: { + ["overlay_analysis_skip_resource_checks" /* OverlayAnalysisSkipResourceChecks */]: { defaultValue: false, - envVar: "CODEQL_ACTION_OVERLAY_ANALYSIS_SWIFT", + envVar: "CODEQL_ACTION_OVERLAY_ANALYSIS_SKIP_RESOURCE_CHECKS", minimumVersion: void 0 }, - ["overlay_analysis_skip_resource_checks" /* OverlayAnalysisSkipResourceChecks */]: { + ["overlay_analysis_swift" /* OverlayAnalysisSwift */]: { defaultValue: false, - envVar: "CODEQL_ACTION_OVERLAY_ANALYSIS_SKIP_RESOURCE_CHECKS", + envVar: "CODEQL_ACTION_OVERLAY_ANALYSIS_SWIFT", minimumVersion: void 0 }, ["python_default_is_to_not_extract_stdlib" /* PythonDefaultIsToNotExtractStdlib */]: { @@ -100221,6 +100221,7 @@ var actionsCache2 = __toESM(require_cache3()); // src/config-utils.ts var OVERLAY_MINIMUM_AVAILABLE_DISK_SPACE_MB = 2e4; var OVERLAY_MINIMUM_AVAILABLE_DISK_SPACE_BYTES = OVERLAY_MINIMUM_AVAILABLE_DISK_SPACE_MB * 1e6; +var OVERLAY_MINIMUM_MEMORY_MB = 5 * 1024; var OVERLAY_ANALYSIS_FEATURES = { actions: "overlay_analysis_actions" /* OverlayAnalysisActions */, cpp: "overlay_analysis_cpp" /* OverlayAnalysisCpp */, diff --git a/lib/upload-lib.js b/lib/upload-lib.js index ab67fece58..5c04f54973 100644 --- a/lib/upload-lib.js +++ b/lib/upload-lib.js @@ -87177,14 +87177,14 @@ var featureConfig = { envVar: "CODEQL_ACTION_OVERLAY_ANALYSIS_RUST", minimumVersion: void 0 }, - ["overlay_analysis_swift" /* OverlayAnalysisSwift */]: { + ["overlay_analysis_skip_resource_checks" /* OverlayAnalysisSkipResourceChecks */]: { defaultValue: false, - envVar: "CODEQL_ACTION_OVERLAY_ANALYSIS_SWIFT", + envVar: "CODEQL_ACTION_OVERLAY_ANALYSIS_SKIP_RESOURCE_CHECKS", minimumVersion: void 0 }, - ["overlay_analysis_skip_resource_checks" /* OverlayAnalysisSkipResourceChecks */]: { + ["overlay_analysis_swift" /* OverlayAnalysisSwift */]: { defaultValue: false, - envVar: "CODEQL_ACTION_OVERLAY_ANALYSIS_SKIP_RESOURCE_CHECKS", + envVar: "CODEQL_ACTION_OVERLAY_ANALYSIS_SWIFT", minimumVersion: void 0 }, ["python_default_is_to_not_extract_stdlib" /* PythonDefaultIsToNotExtractStdlib */]: { @@ -87240,6 +87240,7 @@ var actionsCache2 = __toESM(require_cache3()); // src/config-utils.ts var OVERLAY_MINIMUM_AVAILABLE_DISK_SPACE_MB = 2e4; var OVERLAY_MINIMUM_AVAILABLE_DISK_SPACE_BYTES = OVERLAY_MINIMUM_AVAILABLE_DISK_SPACE_MB * 1e6; +var OVERLAY_MINIMUM_MEMORY_MB = 5 * 1024; var OVERLAY_ANALYSIS_FEATURES = { actions: "overlay_analysis_actions" /* OverlayAnalysisActions */, cpp: "overlay_analysis_cpp" /* OverlayAnalysisCpp */, diff --git a/lib/upload-sarif-action-post.js b/lib/upload-sarif-action-post.js index c1f5f1fb62..5fb0b0d77d 100644 --- a/lib/upload-sarif-action-post.js +++ b/lib/upload-sarif-action-post.js @@ -119753,14 +119753,14 @@ var featureConfig = { envVar: "CODEQL_ACTION_OVERLAY_ANALYSIS_RUST", minimumVersion: void 0 }, - ["overlay_analysis_swift" /* OverlayAnalysisSwift */]: { + ["overlay_analysis_skip_resource_checks" /* OverlayAnalysisSkipResourceChecks */]: { defaultValue: false, - envVar: "CODEQL_ACTION_OVERLAY_ANALYSIS_SWIFT", + envVar: "CODEQL_ACTION_OVERLAY_ANALYSIS_SKIP_RESOURCE_CHECKS", minimumVersion: void 0 }, - ["overlay_analysis_skip_resource_checks" /* OverlayAnalysisSkipResourceChecks */]: { + ["overlay_analysis_swift" /* OverlayAnalysisSwift */]: { defaultValue: false, - envVar: "CODEQL_ACTION_OVERLAY_ANALYSIS_SKIP_RESOURCE_CHECKS", + envVar: "CODEQL_ACTION_OVERLAY_ANALYSIS_SWIFT", minimumVersion: void 0 }, ["python_default_is_to_not_extract_stdlib" /* PythonDefaultIsToNotExtractStdlib */]: { @@ -119798,6 +119798,7 @@ var actionsCache2 = __toESM(require_cache3()); // src/config-utils.ts var OVERLAY_MINIMUM_AVAILABLE_DISK_SPACE_MB = 2e4; var OVERLAY_MINIMUM_AVAILABLE_DISK_SPACE_BYTES = OVERLAY_MINIMUM_AVAILABLE_DISK_SPACE_MB * 1e6; +var OVERLAY_MINIMUM_MEMORY_MB = 5 * 1024; var OVERLAY_ANALYSIS_FEATURES = { actions: "overlay_analysis_actions" /* OverlayAnalysisActions */, cpp: "overlay_analysis_cpp" /* OverlayAnalysisCpp */, diff --git a/lib/upload-sarif-action.js b/lib/upload-sarif-action.js index 5d8f8c92dd..09f6f8d53e 100644 --- a/lib/upload-sarif-action.js +++ b/lib/upload-sarif-action.js @@ -86974,14 +86974,14 @@ var featureConfig = { envVar: "CODEQL_ACTION_OVERLAY_ANALYSIS_RUST", minimumVersion: void 0 }, - ["overlay_analysis_swift" /* OverlayAnalysisSwift */]: { + ["overlay_analysis_skip_resource_checks" /* OverlayAnalysisSkipResourceChecks */]: { defaultValue: false, - envVar: "CODEQL_ACTION_OVERLAY_ANALYSIS_SWIFT", + envVar: "CODEQL_ACTION_OVERLAY_ANALYSIS_SKIP_RESOURCE_CHECKS", minimumVersion: void 0 }, - ["overlay_analysis_skip_resource_checks" /* OverlayAnalysisSkipResourceChecks */]: { + ["overlay_analysis_swift" /* OverlayAnalysisSwift */]: { defaultValue: false, - envVar: "CODEQL_ACTION_OVERLAY_ANALYSIS_SKIP_RESOURCE_CHECKS", + envVar: "CODEQL_ACTION_OVERLAY_ANALYSIS_SWIFT", minimumVersion: void 0 }, ["python_default_is_to_not_extract_stdlib" /* PythonDefaultIsToNotExtractStdlib */]: { @@ -87322,6 +87322,7 @@ var actionsCache2 = __toESM(require_cache3()); // src/config-utils.ts var OVERLAY_MINIMUM_AVAILABLE_DISK_SPACE_MB = 2e4; var OVERLAY_MINIMUM_AVAILABLE_DISK_SPACE_BYTES = OVERLAY_MINIMUM_AVAILABLE_DISK_SPACE_MB * 1e6; +var OVERLAY_MINIMUM_MEMORY_MB = 5 * 1024; var OVERLAY_ANALYSIS_FEATURES = { actions: "overlay_analysis_actions" /* OverlayAnalysisActions */, cpp: "overlay_analysis_cpp" /* OverlayAnalysisCpp */, diff --git a/src/config-utils.test.ts b/src/config-utils.test.ts index d07aacde2e..9f4fb8f137 100644 --- a/src/config-utils.test.ts +++ b/src/config-utils.test.ts @@ -1040,7 +1040,7 @@ const getOverlayDatabaseModeMacro = test.macro({ .stub(actionsUtil, "isAnalyzingPullRequest") .returns(setup.isPullRequest); - sinon.stub(util, "getMemoryFlagValue").returns(setup.memoryFlagValue); + sinon.stub(util, "getCodeQLMemoryLimit").returns(setup.memoryFlagValue); // Set up CodeQL mock const codeql = mockCodeQLVersion(setup.codeqlVersion); diff --git a/src/config-utils.ts b/src/config-utils.ts index 4f3fadf662..7376d5aab6 100644 --- a/src/config-utils.ts +++ b/src/config-utils.ts @@ -44,7 +44,7 @@ import { cloneObject, isDefined, checkDiskUsage, - getMemoryFlagValue, + getCodeQLMemoryLimit, } from "./util"; export * from "./config/db-config"; @@ -60,6 +60,14 @@ const OVERLAY_MINIMUM_AVAILABLE_DISK_SPACE_MB = 20000; const OVERLAY_MINIMUM_AVAILABLE_DISK_SPACE_BYTES = OVERLAY_MINIMUM_AVAILABLE_DISK_SPACE_MB * 1_000_000; +/** + * The minimum memory (in MB) that must be available for CodeQL to perform overlay + * analysis. If CodeQL will be given less memory than this threshold, then the + * action will not perform overlay analysis unless overlay analysis has been + * explicitly enabled via environment variable. + */ +const OVERLAY_MINIMUM_MEMORY_MB = 5 * 1024; + export type RegistryConfigWithCredentials = RegistryConfigNoCredentials & { // Token to use when downloading packs from this registry. token: string; @@ -636,6 +644,10 @@ async function isOverlayAnalysisFeatureEnabled( return true; } +/** + * Checks if the runner supports overlay analysis based on available disk space + * and the maximum memory CodeQL will be allowed to use. + */ async function runnerSupportsOverlayAnalysis( ramInput: string | undefined, logger: Logger, @@ -656,8 +668,8 @@ async function runnerSupportsOverlayAnalysis( return false; } - const memoryFlagValue = getMemoryFlagValue(ramInput, logger); - if (memoryFlagValue < 5 * 1024) { + const memoryFlagValue = getCodeQLMemoryLimit(ramInput, logger); + if (memoryFlagValue < OVERLAY_MINIMUM_MEMORY_MB) { logger.info( `Setting overlay database mode to ${OverlayDatabaseMode.None} ` + `due to insufficient memory for CodeQL analysis (${memoryFlagValue} MB).`, diff --git a/src/feature-flags.ts b/src/feature-flags.ts index 2085dccc40..999ed20d7b 100644 --- a/src/feature-flags.ts +++ b/src/feature-flags.ts @@ -75,8 +75,8 @@ export enum Feature { OverlayAnalysisPython = "overlay_analysis_python", OverlayAnalysisRuby = "overlay_analysis_ruby", OverlayAnalysisRust = "overlay_analysis_rust", - OverlayAnalysisSwift = "overlay_analysis_swift", OverlayAnalysisSkipResourceChecks = "overlay_analysis_skip_resource_checks", + OverlayAnalysisSwift = "overlay_analysis_swift", PythonDefaultIsToNotExtractStdlib = "python_default_is_to_not_extract_stdlib", QaTelemetryEnabled = "qa_telemetry_enabled", UploadOverlayDbToApi = "upload_overlay_db_to_api", @@ -279,14 +279,14 @@ export const featureConfig: Record< envVar: "CODEQL_ACTION_OVERLAY_ANALYSIS_RUST", minimumVersion: undefined, }, - [Feature.OverlayAnalysisSwift]: { + [Feature.OverlayAnalysisSkipResourceChecks]: { defaultValue: false, - envVar: "CODEQL_ACTION_OVERLAY_ANALYSIS_SWIFT", + envVar: "CODEQL_ACTION_OVERLAY_ANALYSIS_SKIP_RESOURCE_CHECKS", minimumVersion: undefined, }, - [Feature.OverlayAnalysisSkipResourceChecks]: { + [Feature.OverlayAnalysisSwift]: { defaultValue: false, - envVar: "CODEQL_ACTION_OVERLAY_ANALYSIS_SKIP_RESOURCE_CHECKS", + envVar: "CODEQL_ACTION_OVERLAY_ANALYSIS_SWIFT", minimumVersion: undefined, }, [Feature.PythonDefaultIsToNotExtractStdlib]: { diff --git a/src/init-action.ts b/src/init-action.ts index 692f0370dd..8fa7899d8f 100644 --- a/src/init-action.ts +++ b/src/init-action.ts @@ -75,7 +75,7 @@ import { codeQlVersionAtLeast, DEFAULT_DEBUG_ARTIFACT_NAME, DEFAULT_DEBUG_DATABASE_NAME, - getMemoryFlagValue, + getCodeQLMemoryLimit, getRequiredEnvParam, getThreadsFlagValue, initializeEnvironment, @@ -538,7 +538,7 @@ async function run() { core.exportVariable( "CODEQL_RAM", process.env["CODEQL_RAM"] || - getMemoryFlagValue(getOptionalInput("ram"), logger).toString(), + getCodeQLMemoryLimit(getOptionalInput("ram"), logger).toString(), ); core.exportVariable( "CODEQL_THREADS", diff --git a/src/util.ts b/src/util.ts index aefcc5a2af..7bcdb41621 100644 --- a/src/util.ts +++ b/src/util.ts @@ -309,13 +309,13 @@ function getCgroupMemoryLimitBytes( } /** - * Get the value of the codeql `--ram` flag as configured by the `ram` input. - * If no value was specified, the total available memory will be used minus a + * Get the maximum amount of memory CodeQL is allowed to use. If no limit has been + * configured by the user, then the total available memory will be used minus a * threshold reserved for the OS. * - * @returns {number} the amount of RAM to use, in megabytes + * @returns {number} the amount of RAM CodeQL is allowed to use, in megabytes */ -export function getMemoryFlagValue( +export function getCodeQLMemoryLimit( userInput: string | undefined, logger: Logger, ): number { @@ -337,7 +337,7 @@ export function getMemoryFlag( userInput: string | undefined, logger: Logger, ): string { - const megabytes = getMemoryFlagValue(userInput, logger); + const megabytes = getCodeQLMemoryLimit(userInput, logger); return `--ram=${megabytes}`; }