mirror of
https://github.com/github/codeql-action.git
synced 2026-10-03 17:41:28 +00:00
Return mergedConfig instead of loading it again
This commit is contained in:
14
lib/entry-points.js
generated
14
lib/entry-points.js
generated
@@ -148722,13 +148722,17 @@ async function determineUserConfig(logger, env, features, tempDir, inputs) {
|
||||
tempDir,
|
||||
validateConfig
|
||||
);
|
||||
fs9.writeFileSync(
|
||||
computedConfigPath,
|
||||
dump(mergeUserConfigs(logger, fromConfigInput, fromConfigFile))
|
||||
const mergedConfig = mergeUserConfigs(
|
||||
logger,
|
||||
fromConfigInput,
|
||||
fromConfigFile
|
||||
);
|
||||
fs9.writeFileSync(computedConfigPath, dump(mergedConfig));
|
||||
logger.debug(
|
||||
`Using merged configurations from 'config' input with configuration from '${inputs.configFile}': ${computedConfigPath}`
|
||||
);
|
||||
inputs.configFile = computedConfigPath;
|
||||
return mergedConfig;
|
||||
} else {
|
||||
if (inputs.configFile) {
|
||||
logger.warning(
|
||||
@@ -148736,9 +148740,9 @@ async function determineUserConfig(logger, env, features, tempDir, inputs) {
|
||||
);
|
||||
}
|
||||
fs9.writeFileSync(computedConfigPath, inputs.configInput);
|
||||
logger.debug(`Using config from action input: ${computedConfigPath}`);
|
||||
inputs.configFile = computedConfigPath;
|
||||
logger.debug(`Using config from action input: ${inputs.configFile}`);
|
||||
}
|
||||
inputs.configFile = computedConfigPath;
|
||||
}
|
||||
if (!inputs.configFile) {
|
||||
logger.debug("No configuration file was provided");
|
||||
|
||||
Reference in New Issue
Block a user