Use overlay-aware version for code scanning exclusively

Author: henrymercer

lib/init-action.js

@@ -304,9 +304,9 @@ async function run(startedAt: Date) {
     const rawLanguages = configUtils.getRawLanguagesNoAutodetect(
       getOptionalInput("languages"),
     );
-    const useOverlayAwareDefaultCliVersion = !!analysisKinds?.includes(
-      AnalysisKind.CodeScanning,
-    );
+    const useOverlayAwareDefaultCliVersion =
+      analysisKinds?.length === 1 &&
+      analysisKinds[0] === AnalysisKind.CodeScanning;
     const initCodeQLResult = await initCodeQL(
       getOptionalInput("tools"),
       apiDetails,

lib/setup-codeql-action.js

@@ -152,7 +152,8 @@ async function run(startedAt: Date): Promise<void> {
       gitHubVersion.type,
       codeQLDefaultVersionInfo,
       rawLanguages,
-      analysisKinds.includes(AnalysisKind.CodeScanning),
+      analysisKinds.length === 1 &&
+        analysisKinds[0] === AnalysisKind.CodeScanning,
       features,
       logger,
     );