Accept options from both sources, prioritize external config.

2022-09-20 15:52:34 +02:00
parent 37dc32836b
commit eef7e39202
5 changed files with 33 additions and 6 deletions
@@ -14938,7 +14938,9 @@ function getOptionalInput(name) {
 function readConfig() {
    const externalConfig = getOptionalInput('config-file');
    if (externalConfig !== undefined) {
-        return readConfigFile(externalConfig);
+        const config = readConfigFile(externalConfig);
+        const inlineConfig = readInlineConfig();
+        return Object.assign({}, inlineConfig, config);
    }
    else {
        return readInlineConfig();