From 3ee9287c7a0dd4982d0eb5e8f663893f1f70c26d Mon Sep 17 00:00:00 2001
From: "Michael B. Gale" <mbg@github.com>
Date: Tue, 2 Sep 2025 08:45:16 +0100
Subject: [PATCH] Update condition and comment for CQ-only config

---
 lib/init-action.js  | 6 +++---
 src/config-utils.ts | 7 ++++---
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/lib/init-action.js b/lib/init-action.js
index 367504727..80acb0820 100644
--- a/lib/init-action.js
+++ b/lib/init-action.js
@@ -87610,7 +87610,7 @@ async function initConfig(inputs) {
     );
   }
   const config = await initActionState(inputs, userConfig);
-  if (!isCodeScanningEnabled(config)) {
+  if (config.analysisKinds.length === 1 && isCodeQualityEnabled(config)) {
     if (hasQueryCustomisation(config.computedConfig)) {
       logger.warning(
         "Query customizations will be ignored, because only `code-quality` analysis is enabled."
@@ -87857,8 +87857,8 @@ function appendExtraQueryExclusions(extraQueryExclusions, cliConfig) {
   }
   return augmentedConfig;
 }
-function isCodeScanningEnabled(config) {
-  return config.analysisKinds.includes("code-scanning" /* CodeScanning */);
+function isCodeQualityEnabled(config) {
+  return config.analysisKinds.includes("code-quality" /* CodeQuality */);
 }
 
 // src/dependency-caching.ts
diff --git a/src/config-utils.ts b/src/config-utils.ts
index 6e99bb737..a66e63e13 100644
--- a/src/config-utils.ts
+++ b/src/config-utils.ts
@@ -1131,9 +1131,10 @@ export async function initConfig(inputs: InitConfigInputs): Promise<Config> {
 
   const config = await initActionState(inputs, userConfig);
 
-  // If Code Scanning analysis is disabled, then we initialise the database for Code Quality.
-  // That entails disabling the default queries and only running quality queries.
-  if (!isCodeScanningEnabled(config)) {
+  // If Code Quality analysis is the only enabled analysis kind, then we will initialise
+  // the database for Code Quality. That entails disabling the default queries and only
+  // running quality queries. We do not currently support query customisations in that case.
+  if (config.analysisKinds.length === 1 && isCodeQualityEnabled(config)) {
     // Warn if any query customisations are present in the computed configuration.
     if (hasQueryCustomisation(config.computedConfig)) {
       logger.warning(