From a796e3e4ed79ee0f1517ab0535d1fb7196eb5ac9 Mon Sep 17 00:00:00 2001 From: Henry Mercer Date: Wed, 6 May 2026 15:14:04 +0100 Subject: [PATCH] Add OverlayAnalysisMatchCodeqlVersion feature flag --- lib/analyze-action-post.js | 5 +++++ lib/analyze-action.js | 5 +++++ lib/autobuild-action.js | 5 +++++ lib/init-action-post.js | 5 +++++ lib/init-action.js | 5 +++++ lib/resolve-environment-action.js | 5 +++++ lib/setup-codeql-action.js | 5 +++++ lib/start-proxy-action-post.js | 5 +++++ lib/start-proxy-action.js | 5 +++++ lib/upload-lib.js | 5 +++++ lib/upload-sarif-action-post.js | 5 +++++ lib/upload-sarif-action.js | 5 +++++ src/feature-flags.ts | 12 ++++++++++++ 13 files changed, 72 insertions(+) diff --git a/lib/analyze-action-post.js b/lib/analyze-action-post.js index 7c1046ab3..0ecdbe3fe 100644 --- a/lib/analyze-action-post.js +++ b/lib/analyze-action-post.js @@ -162803,6 +162803,11 @@ var featureConfig = { envVar: "CODEQL_ACTION_OVERLAY_ANALYSIS_JAVASCRIPT", minimumVersion: CODEQL_OVERLAY_MINIMUM_VERSION_JAVASCRIPT }, + ["overlay_analysis_match_codeql_version" /* OverlayAnalysisMatchCodeqlVersion */]: { + defaultValue: false, + envVar: "CODEQL_ACTION_OVERLAY_ANALYSIS_MATCH_CODEQL_VERSION", + minimumVersion: void 0 + }, ["overlay_analysis_python" /* OverlayAnalysisPython */]: { defaultValue: false, envVar: "CODEQL_ACTION_OVERLAY_ANALYSIS_PYTHON", diff --git a/lib/analyze-action.js b/lib/analyze-action.js index 163a41c7e..558ad5147 100644 --- a/lib/analyze-action.js +++ b/lib/analyze-action.js @@ -108403,6 +108403,11 @@ var featureConfig = { envVar: "CODEQL_ACTION_OVERLAY_ANALYSIS_JAVASCRIPT", minimumVersion: CODEQL_OVERLAY_MINIMUM_VERSION_JAVASCRIPT }, + ["overlay_analysis_match_codeql_version" /* OverlayAnalysisMatchCodeqlVersion */]: { + defaultValue: false, + envVar: "CODEQL_ACTION_OVERLAY_ANALYSIS_MATCH_CODEQL_VERSION", + minimumVersion: void 0 + }, ["overlay_analysis_python" /* OverlayAnalysisPython */]: { defaultValue: false, envVar: "CODEQL_ACTION_OVERLAY_ANALYSIS_PYTHON", diff --git a/lib/autobuild-action.js b/lib/autobuild-action.js index 8fdbf5fa6..3ba526579 100644 --- a/lib/autobuild-action.js +++ b/lib/autobuild-action.js @@ -104855,6 +104855,11 @@ var featureConfig = { envVar: "CODEQL_ACTION_OVERLAY_ANALYSIS_JAVASCRIPT", minimumVersion: CODEQL_OVERLAY_MINIMUM_VERSION_JAVASCRIPT }, + ["overlay_analysis_match_codeql_version" /* OverlayAnalysisMatchCodeqlVersion */]: { + defaultValue: false, + envVar: "CODEQL_ACTION_OVERLAY_ANALYSIS_MATCH_CODEQL_VERSION", + minimumVersion: void 0 + }, ["overlay_analysis_python" /* OverlayAnalysisPython */]: { defaultValue: false, envVar: "CODEQL_ACTION_OVERLAY_ANALYSIS_PYTHON", diff --git a/lib/init-action-post.js b/lib/init-action-post.js index e4fa85efb..f589829b3 100644 --- a/lib/init-action-post.js +++ b/lib/init-action-post.js @@ -166326,6 +166326,11 @@ var featureConfig = { envVar: "CODEQL_ACTION_OVERLAY_ANALYSIS_JAVASCRIPT", minimumVersion: CODEQL_OVERLAY_MINIMUM_VERSION_JAVASCRIPT }, + ["overlay_analysis_match_codeql_version" /* OverlayAnalysisMatchCodeqlVersion */]: { + defaultValue: false, + envVar: "CODEQL_ACTION_OVERLAY_ANALYSIS_MATCH_CODEQL_VERSION", + minimumVersion: void 0 + }, ["overlay_analysis_python" /* OverlayAnalysisPython */]: { defaultValue: false, envVar: "CODEQL_ACTION_OVERLAY_ANALYSIS_PYTHON", diff --git a/lib/init-action.js b/lib/init-action.js index 60fb14071..2dbf6b3d0 100644 --- a/lib/init-action.js +++ b/lib/init-action.js @@ -105960,6 +105960,11 @@ var featureConfig = { envVar: "CODEQL_ACTION_OVERLAY_ANALYSIS_JAVASCRIPT", minimumVersion: CODEQL_OVERLAY_MINIMUM_VERSION_JAVASCRIPT }, + ["overlay_analysis_match_codeql_version" /* OverlayAnalysisMatchCodeqlVersion */]: { + defaultValue: false, + envVar: "CODEQL_ACTION_OVERLAY_ANALYSIS_MATCH_CODEQL_VERSION", + minimumVersion: void 0 + }, ["overlay_analysis_python" /* OverlayAnalysisPython */]: { defaultValue: false, envVar: "CODEQL_ACTION_OVERLAY_ANALYSIS_PYTHON", diff --git a/lib/resolve-environment-action.js b/lib/resolve-environment-action.js index efa88bd40..c819d2eda 100644 --- a/lib/resolve-environment-action.js +++ b/lib/resolve-environment-action.js @@ -104846,6 +104846,11 @@ var featureConfig = { envVar: "CODEQL_ACTION_OVERLAY_ANALYSIS_JAVASCRIPT", minimumVersion: CODEQL_OVERLAY_MINIMUM_VERSION_JAVASCRIPT }, + ["overlay_analysis_match_codeql_version" /* OverlayAnalysisMatchCodeqlVersion */]: { + defaultValue: false, + envVar: "CODEQL_ACTION_OVERLAY_ANALYSIS_MATCH_CODEQL_VERSION", + minimumVersion: void 0 + }, ["overlay_analysis_python" /* OverlayAnalysisPython */]: { defaultValue: false, envVar: "CODEQL_ACTION_OVERLAY_ANALYSIS_PYTHON", diff --git a/lib/setup-codeql-action.js b/lib/setup-codeql-action.js index 1d25f46c2..86a1340f4 100644 --- a/lib/setup-codeql-action.js +++ b/lib/setup-codeql-action.js @@ -104697,6 +104697,11 @@ var featureConfig = { envVar: "CODEQL_ACTION_OVERLAY_ANALYSIS_JAVASCRIPT", minimumVersion: CODEQL_OVERLAY_MINIMUM_VERSION_JAVASCRIPT }, + ["overlay_analysis_match_codeql_version" /* OverlayAnalysisMatchCodeqlVersion */]: { + defaultValue: false, + envVar: "CODEQL_ACTION_OVERLAY_ANALYSIS_MATCH_CODEQL_VERSION", + minimumVersion: void 0 + }, ["overlay_analysis_python" /* OverlayAnalysisPython */]: { defaultValue: false, envVar: "CODEQL_ACTION_OVERLAY_ANALYSIS_PYTHON", diff --git a/lib/start-proxy-action-post.js b/lib/start-proxy-action-post.js index 9cc3c099a..d65876fc2 100644 --- a/lib/start-proxy-action-post.js +++ b/lib/start-proxy-action-post.js @@ -162123,6 +162123,11 @@ var featureConfig = { envVar: "CODEQL_ACTION_OVERLAY_ANALYSIS_JAVASCRIPT", minimumVersion: CODEQL_OVERLAY_MINIMUM_VERSION_JAVASCRIPT }, + ["overlay_analysis_match_codeql_version" /* OverlayAnalysisMatchCodeqlVersion */]: { + defaultValue: false, + envVar: "CODEQL_ACTION_OVERLAY_ANALYSIS_MATCH_CODEQL_VERSION", + minimumVersion: void 0 + }, ["overlay_analysis_python" /* OverlayAnalysisPython */]: { defaultValue: false, envVar: "CODEQL_ACTION_OVERLAY_ANALYSIS_PYTHON", diff --git a/lib/start-proxy-action.js b/lib/start-proxy-action.js index ad8b42d02..d3dbfcc98 100644 --- a/lib/start-proxy-action.js +++ b/lib/start-proxy-action.js @@ -121494,6 +121494,11 @@ var featureConfig = { envVar: "CODEQL_ACTION_OVERLAY_ANALYSIS_JAVASCRIPT", minimumVersion: CODEQL_OVERLAY_MINIMUM_VERSION_JAVASCRIPT }, + ["overlay_analysis_match_codeql_version" /* OverlayAnalysisMatchCodeqlVersion */]: { + defaultValue: false, + envVar: "CODEQL_ACTION_OVERLAY_ANALYSIS_MATCH_CODEQL_VERSION", + minimumVersion: void 0 + }, ["overlay_analysis_python" /* OverlayAnalysisPython */]: { defaultValue: false, envVar: "CODEQL_ACTION_OVERLAY_ANALYSIS_PYTHON", diff --git a/lib/upload-lib.js b/lib/upload-lib.js index a0e9fc0c5..9ab80fc08 100644 --- a/lib/upload-lib.js +++ b/lib/upload-lib.js @@ -108009,6 +108009,11 @@ var featureConfig = { envVar: "CODEQL_ACTION_OVERLAY_ANALYSIS_JAVASCRIPT", minimumVersion: CODEQL_OVERLAY_MINIMUM_VERSION_JAVASCRIPT }, + ["overlay_analysis_match_codeql_version" /* OverlayAnalysisMatchCodeqlVersion */]: { + defaultValue: false, + envVar: "CODEQL_ACTION_OVERLAY_ANALYSIS_MATCH_CODEQL_VERSION", + minimumVersion: void 0 + }, ["overlay_analysis_python" /* OverlayAnalysisPython */]: { defaultValue: false, envVar: "CODEQL_ACTION_OVERLAY_ANALYSIS_PYTHON", diff --git a/lib/upload-sarif-action-post.js b/lib/upload-sarif-action-post.js index 7415e2ba9..1913fac84 100644 --- a/lib/upload-sarif-action-post.js +++ b/lib/upload-sarif-action-post.js @@ -162293,6 +162293,11 @@ var featureConfig = { envVar: "CODEQL_ACTION_OVERLAY_ANALYSIS_JAVASCRIPT", minimumVersion: CODEQL_OVERLAY_MINIMUM_VERSION_JAVASCRIPT }, + ["overlay_analysis_match_codeql_version" /* OverlayAnalysisMatchCodeqlVersion */]: { + defaultValue: false, + envVar: "CODEQL_ACTION_OVERLAY_ANALYSIS_MATCH_CODEQL_VERSION", + minimumVersion: void 0 + }, ["overlay_analysis_python" /* OverlayAnalysisPython */]: { defaultValue: false, envVar: "CODEQL_ACTION_OVERLAY_ANALYSIS_PYTHON", diff --git a/lib/upload-sarif-action.js b/lib/upload-sarif-action.js index 088eef393..00df3fef8 100644 --- a/lib/upload-sarif-action.js +++ b/lib/upload-sarif-action.js @@ -107682,6 +107682,11 @@ var featureConfig = { envVar: "CODEQL_ACTION_OVERLAY_ANALYSIS_JAVASCRIPT", minimumVersion: CODEQL_OVERLAY_MINIMUM_VERSION_JAVASCRIPT }, + ["overlay_analysis_match_codeql_version" /* OverlayAnalysisMatchCodeqlVersion */]: { + defaultValue: false, + envVar: "CODEQL_ACTION_OVERLAY_ANALYSIS_MATCH_CODEQL_VERSION", + minimumVersion: void 0 + }, ["overlay_analysis_python" /* OverlayAnalysisPython */]: { defaultValue: false, envVar: "CODEQL_ACTION_OVERLAY_ANALYSIS_PYTHON", diff --git a/src/feature-flags.ts b/src/feature-flags.ts index 80adce550..b9afbb849 100644 --- a/src/feature-flags.ts +++ b/src/feature-flags.ts @@ -72,6 +72,13 @@ export enum Feature { OverlayAnalysisGo = "overlay_analysis_go", OverlayAnalysisJava = "overlay_analysis_java", OverlayAnalysisJavascript = "overlay_analysis_javascript", + /** + * When set, chooses the default CodeQL CLI version as the highest version that is both enabled by + * feature flags and present as an overlay-base database in the Actions cache for the configured + * languages. Falls back to the highest feature flagged version if no intersecting overlay-base + * database exists in the cache. + */ + OverlayAnalysisMatchCodeqlVersion = "overlay_analysis_match_codeql_version", OverlayAnalysisPython = "overlay_analysis_python", /** * Controls whether lower disk space requirements are used for overlay hardware checks. @@ -277,6 +284,11 @@ export const featureConfig = { envVar: "CODEQL_ACTION_OVERLAY_ANALYSIS_DISABLE_TRAP_CACHING", minimumVersion: undefined, }, + [Feature.OverlayAnalysisMatchCodeqlVersion]: { + defaultValue: false, + envVar: "CODEQL_ACTION_OVERLAY_ANALYSIS_MATCH_CODEQL_VERSION", + minimumVersion: undefined, + }, [Feature.OverlayAnalysisResourceChecksV2]: { defaultValue: false, envVar: "CODEQL_ACTION_OVERLAY_ANALYSIS_RESOURCE_CHECKS_V2",