🐛 QD-10155 Stop throwing error on non-zero exit code from merge-base …

…call
JetBrains · Oct 28, 2024 · 31d6f33 · 31d6f33
1 parent 4f04143
commit 31d6f33
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 6 deletions.
diff --git a/scan/dist/index.js b/scan/dist/index.js
@@ -135166,7 +135166,9 @@ var require_utils10 = __commonJS({
             "merge-base",
             github2.context.payload.pull_request.base.sha,
             github2.context.payload.pull_request.head.sha
-          ]);
+          ], {
+            ignoreReturnCode: true
+          });
           if (output.exitCode === 0) {
             return output.stdout.trim();
           } else {

diff --git a/scan/src/utils.ts b/scan/src/utils.ts
@@ -96,11 +96,16 @@ async function getPrSha(): Promise<string> {
     return process.env.QODANA_PR_SHA
   }
   if (github.context.payload.pull_request !== undefined) {
-    const output = await gitOutput([
-      'merge-base',
-      github.context.payload.pull_request.base.sha,
-      github.context.payload.pull_request.head.sha
-    ])
+    const output = await gitOutput(
+      [
+        'merge-base',
+        github.context.payload.pull_request.base.sha,
+        github.context.payload.pull_request.head.sha
+      ],
+      {
+        ignoreReturnCode: true
+      }
+    )
     if (output.exitCode === 0) {
       return output.stdout.trim()
     } else {