From c1fc897eb2772cf0e0b04e05596442025a2880ff Mon Sep 17 00:00:00 2001 From: Chuan-kai Lin Date: Thu, 27 Mar 2025 08:50:31 -0700 Subject: [PATCH] getFileDiffsWithBasehead(): use CODE_SCANNING_REPOSITORY if present --- src/analyze.ts | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/src/analyze.ts b/src/analyze.ts index 592c9ab90..e7b1ce1f9 100644 --- a/src/analyze.ts +++ b/src/analyze.ts @@ -22,7 +22,7 @@ import { EnvVar } from "./environment"; import { FeatureEnablement, Feature } from "./feature-flags"; import { isScannedLanguage, Language } from "./languages"; import { Logger, withGroupAsync } from "./logging"; -import { getRepositoryNwo } from "./repository"; +import { getRepositoryNwoFromEnv } from "./repository"; import { DatabaseCreationTimings, EventReport } from "./status-report"; import { ToolsFeature } from "./tools-features"; import { endTracingForCluster } from "./tracer-config"; @@ -390,7 +390,12 @@ async function getFileDiffsWithBasehead( branches: PullRequestBranches, logger: Logger, ): Promise { - const repositoryNwo = getRepositoryNwo(); + // Check CODE_SCANNING_REPOSITORY first. If it is empty or not set, fall back + // to GITHUB_REPOSITORY. + const repositoryNwo = getRepositoryNwoFromEnv( + "CODE_SCANNING_REPOSITORY", + "GITHUB_REPOSITORY", + ); const basehead = `${branches.base}...${branches.head}`; try { const response = await getApiClient().rest.repos.compareCommitsWithBasehead(