diff --git a/lib/entry-points.js b/lib/entry-points.js index 978cdf95e..5cf6997ee 100644 --- a/lib/entry-points.js +++ b/lib/entry-points.js @@ -150486,7 +150486,7 @@ async function loadRepositoryProperties(repositoryNwo, logger) { try { return new Success(await loadPropertiesFromApi(logger, repositoryNwo)); } catch (error3) { - logger.warning( + logger.info( `Failed to load repository properties: ${getErrorMessage(error3)}` ); return new Failure(error3); @@ -158715,8 +158715,8 @@ var core21 = __toESM(require_core()); var io7 = __toESM(require_io()); var semver10 = __toESM(require_semver2()); -// src/resolve-tools-input.ts -function resolveToolsInput(toolsWorkflowInput, repositoryProperties, logger) { +// src/config/resolve-tools-input.ts +function resolveToolsInput(toolsWorkflowInput, allowRepositoryPropertyFallback, repositoryProperties, logger) { if (toolsWorkflowInput) { logger.info( `Setting tools: ${toolsWorkflowInput} based on workflow input.` @@ -158724,6 +158724,14 @@ function resolveToolsInput(toolsWorkflowInput, repositoryProperties, logger) { return toolsWorkflowInput; } const toolsPropertyValue = repositoryProperties["github-codeql-tools" /* TOOLS */]; + if (!allowRepositoryPropertyFallback) { + if (toolsPropertyValue) { + logger.info( + `No explicit tools input was provided. Ignoring '${"github-codeql-tools" /* TOOLS */}' repository property because it is only supported for dynamic workflows.` + ); + } + return void 0; + } if (toolsPropertyValue) { logger.info( `Setting tools: ${toolsPropertyValue} based on the '${"github-codeql-tools" /* TOOLS */}' repository property.` @@ -159137,6 +159145,7 @@ async function run3(startedAt) { toolsFeatureFlagsValid = codeQLDefaultVersionInfo.toolsFeatureFlagsValid; effectiveToolsInput = resolveToolsInput( getOptionalInput("tools"), + isDynamicWorkflow(), repositoryProperties, logger ); @@ -160150,6 +160159,7 @@ async function run6(startedAt) { const repositoryProperties = repositoryPropertiesResult.orElse({}); effectiveToolsInput = resolveToolsInput( getOptionalInput("tools"), + isDynamicWorkflow(), repositoryProperties, logger );