From 3c4533916b963c63f940e5ba42a99b16fd49bffb Mon Sep 17 00:00:00 2001
From: Chuan-kai Lin <cklin@github.com>
Date: Thu, 27 Mar 2025 10:21:05 -0700
Subject: [PATCH] Call shouldPerformDiffInformedAnalysis() outside
 setupDiffInformedQueryRun()

---
 src/analyze-action.ts |  8 ++++++--
 src/analyze.ts        | 13 +------------
 2 files changed, 7 insertions(+), 14 deletions(-)

diff --git a/src/analyze-action.ts b/src/analyze-action.ts
index 3b50a6e4c..37f125dad 100644
--- a/src/analyze-action.ts
+++ b/src/analyze-action.ts
@@ -22,6 +22,7 @@ import { getCodeQL } from "./codeql";
 import { Config, getConfig } from "./config-utils";
 import { uploadDatabases } from "./database-upload";
 import { uploadDependencyCaches } from "./dependency-caching";
+import { shouldPerformDiffInformedAnalysis } from "./diff-informed-analysis-utils";
 import { EnvVar } from "./environment";
 import { Features } from "./feature-flags";
 import { Language } from "./languages";
@@ -269,11 +270,14 @@ async function run() {
       logger,
     );
 
-    const diffRangePackDir = await setupDiffInformedQueryRun(
+    const branches = await shouldPerformDiffInformedAnalysis(
       codeql,
-      logger,
       features,
+      logger,
     );
+    const diffRangePackDir = branches
+      ? await setupDiffInformedQueryRun(branches, logger)
+      : undefined;
 
     await warnIfGoInstalledAfterInit(config, logger);
     await runAutobuildIfLegacyGoWorkflow(config, logger);
diff --git a/src/analyze.ts b/src/analyze.ts
index b11219aa2..a517a3638 100644
--- a/src/analyze.ts
+++ b/src/analyze.ts
@@ -16,7 +16,6 @@ import { addDiagnostic, makeDiagnostic } from "./diagnostics";
 import {
   DiffThunkRange,
   PullRequestBranches,
-  shouldPerformDiffInformedAnalysis,
   writeDiffRangesJsonFile,
 } from "./diff-informed-analysis-utils";
 import { EnvVar } from "./environment";
@@ -263,19 +262,9 @@ async function finalizeDatabaseCreation(
  * the diff range information, or `undefined` if the feature is disabled.
  */
 export async function setupDiffInformedQueryRun(
-  codeql: CodeQL,
+  branches: PullRequestBranches,
   logger: Logger,
-  features: FeatureEnablement,
 ): Promise<string | undefined> {
-  const branches = await shouldPerformDiffInformedAnalysis(
-    codeql,
-    features,
-    logger,
-  );
-  if (!branches) {
-    return undefined;
-  }
-
   return await withGroupAsync(
     "Generating diff range extension pack",
     async () => {