mirror of
https://github.com/github/codeql-action.git
synced 2026-10-03 17:41:28 +00:00
Merge pull request #2135 from github/henrymercer/no-analyze-config
Avoid analyzing generated configuration file
This commit is contained in:
4
lib/config-utils.js
generated
4
lib/config-utils.js
generated
@@ -462,13 +462,13 @@ function dbLocationOrDefault(dbLocation, tempDir) {
|
||||
*/
|
||||
async function initConfig(inputs) {
|
||||
let config;
|
||||
const { logger, workspacePath } = inputs;
|
||||
const { logger, tempDir } = inputs;
|
||||
// if configInput is set, it takes precedence over configFile
|
||||
if (inputs.configInput) {
|
||||
if (inputs.configFile) {
|
||||
logger.warning(`Both a config file and config input were provided. Ignoring config file.`);
|
||||
}
|
||||
inputs.configFile = path.resolve(workspacePath, "user-config-from-action.yml");
|
||||
inputs.configFile = path.resolve(tempDir, "user-config-from-action.yml");
|
||||
fs.writeFileSync(inputs.configFile, inputs.configInput);
|
||||
logger.debug(`Using config from action input: ${inputs.configFile}`);
|
||||
}
|
||||
|
||||
File diff suppressed because one or more lines are too long
@@ -813,7 +813,7 @@ function dbLocationOrDefault(
|
||||
export async function initConfig(inputs: InitConfigInputs): Promise<Config> {
|
||||
let config: Config;
|
||||
|
||||
const { logger, workspacePath } = inputs;
|
||||
const { logger, tempDir } = inputs;
|
||||
|
||||
// if configInput is set, it takes precedence over configFile
|
||||
if (inputs.configInput) {
|
||||
@@ -822,10 +822,7 @@ export async function initConfig(inputs: InitConfigInputs): Promise<Config> {
|
||||
`Both a config file and config input were provided. Ignoring config file.`,
|
||||
);
|
||||
}
|
||||
inputs.configFile = path.resolve(
|
||||
workspacePath,
|
||||
"user-config-from-action.yml",
|
||||
);
|
||||
inputs.configFile = path.resolve(tempDir, "user-config-from-action.yml");
|
||||
fs.writeFileSync(inputs.configFile, inputs.configInput);
|
||||
logger.debug(`Using config from action input: ${inputs.configFile}`);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user