fix: out-format (#770)

golangci · Jun 12, 2023 · 569abaa · 569abaa
1 parent c57cc43
commit 569abaa
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 3 deletions.
diff --git a/dist/post_run/index.js b/dist/post_run/index.js
@@ -66637,7 +66637,7 @@ function runLint(lintPath, patchPath) {
             const res = yield execShellCommand(`${lintPath} cache status`);
             printOutput(res);
         }
-        const userArgs = core.getInput(`args`);
+        let userArgs = core.getInput(`args`);
         const addedArgs = [];
         const userArgsList = userArgs
             .trim()
@@ -66656,6 +66656,7 @@ function runLint(lintPath, patchPath) {
             .concat("github-actions")
             .join(",");
         addedArgs.push(`--out-format=${formats}`);
+        userArgs = userArgs.replace(/--out-format=\S*/gi, "").trim();
         if (patchPath) {
             if (userArgNames.has(`new`) || userArgNames.has(`new-from-rev`) || userArgNames.has(`new-from-patch`)) {
                 throw new Error(`please, don't specify manually --new* args when requesting only new issues`);

diff --git a/dist/run/index.js b/dist/run/index.js
@@ -66637,7 +66637,7 @@ function runLint(lintPath, patchPath) {
             const res = yield execShellCommand(`${lintPath} cache status`);
             printOutput(res);
         }
-        const userArgs = core.getInput(`args`);
+        let userArgs = core.getInput(`args`);
         const addedArgs = [];
         const userArgsList = userArgs
             .trim()
@@ -66656,6 +66656,7 @@ function runLint(lintPath, patchPath) {
             .concat("github-actions")
             .join(",");
         addedArgs.push(`--out-format=${formats}`);
+        userArgs = userArgs.replace(/--out-format=\S*/gi, "").trim();
         if (patchPath) {
             if (userArgNames.has(`new`) || userArgNames.has(`new-from-rev`) || userArgNames.has(`new-from-patch`)) {
                 throw new Error(`please, don't specify manually --new* args when requesting only new issues`);

diff --git a/src/run.ts b/src/run.ts
@@ -118,7 +118,7 @@ async function runLint(lintPath: string, patchPath: string): Promise<void> {
     printOutput(res)
   }
 
-  const userArgs = core.getInput(`args`)
+  let userArgs = core.getInput(`args`)
   const addedArgs: string[] = []
 
   const userArgsList = userArgs
@@ -141,6 +141,7 @@ async function runLint(lintPath: string, patchPath: string): Promise<void> {
     .join(",")
 
   addedArgs.push(`--out-format=${formats}`)
+  userArgs = userArgs.replace(/--out-format=\S*/gi, "").trim()
 
   if (patchPath) {
     if (userArgNames.has(`new`) || userArgNames.has(`new-from-rev`) || userArgNames.has(`new-from-patch`)) {