From 40e257570ce557628c027f17022907185b4ac44f Mon Sep 17 00:00:00 2001
From: "Michael B. Gale" <mbg@github.com>
Date: Mon, 1 Sep 2025 15:24:37 +0100
Subject: [PATCH] Store computed Code Scanning config in variable

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

diff --git a/lib/init-action.js b/lib/init-action.js
index 098993716..d4cc5226c 100644
--- a/lib/init-action.js
+++ b/lib/init-action.js
@@ -90127,6 +90127,10 @@ async function initConfig(inputs) {
   }
   const config = await getDefaultConfig(inputs);
   config.originalUserInput = userConfig;
+  const codeScanningConfig = generateCodeScanningConfig(
+    userConfig,
+    config.augmentationProperties
+  );
   const { overlayDatabaseMode, useOverlayDatabaseCaching } = await getOverlayDatabaseMode(
     inputs.codeql,
     inputs.repository,
@@ -90134,7 +90138,7 @@ async function initConfig(inputs) {
     config.languages,
     inputs.sourceRoot,
     config.buildMode,
-    generateCodeScanningConfig(userConfig, config.augmentationProperties),
+    codeScanningConfig,
     logger
   );
   logger.info(
diff --git a/src/config-utils.ts b/src/config-utils.ts
index a3fcc219f..3aead4778 100644
--- a/src/config-utils.ts
+++ b/src/config-utils.ts
@@ -1110,6 +1110,13 @@ export async function initConfig(inputs: InitConfigInputs): Promise<Config> {
   // Store the `UserConfig` (if any) in the `Config`.
   config.originalUserInput = userConfig;
 
+  // Compute the full Code Scanning configuration that combines the configuration from the
+  // configuration file / `config` input with other inputs, such as `queries`.
+  const codeScanningConfig = generateCodeScanningConfig(
+    userConfig,
+    config.augmentationProperties,
+  );
+
   // The choice of overlay database mode depends on the selection of languages
   // and queries, which in turn depends on the user config and the augmentation
   // properties. So we need to calculate the overlay database mode after the
@@ -1122,7 +1129,7 @@ export async function initConfig(inputs: InitConfigInputs): Promise<Config> {
       config.languages,
       inputs.sourceRoot,
       config.buildMode,
-      generateCodeScanningConfig(userConfig, config.augmentationProperties),
+      codeScanningConfig,
       logger,
     );
   logger.info(