Merge branch 'main' into henrymercer/java-buildless-rollback
This commit is contained in:
commit
eb60ca25f8
128 changed files with 1109 additions and 594 deletions
4
lib/config-utils.js
generated
4
lib/config-utils.js
generated
|
|
@ -465,13 +465,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}`);
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue