Merge pull request #653 from peter-evans/fix-error-handling

fix: change or->and to catch all errors
peter-evans · Dec 9, 2020 · 8c603db · 8c603db
2 parents ce699aa + d01e080
commit 8c603db
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 4 deletions.
diff --git a/dist/index.js b/dist/index.js
@@ -911,8 +911,11 @@ class GitHubHelper {
                 };
             }
             catch (e) {
-                if (!e.message ||
-                    !e.message.includes(`A pull request already exists for ${headBranch}`)) {
+                if (e.message &&
+                    e.message.includes(`A pull request already exists for ${headBranch}`)) {
+                    core.info(`A pull request already exists for ${headBranch}`);
+                }
+                else {
                     throw e;
                 }
             }

diff --git a/src/github-helper.ts b/src/github-helper.ts
@@ -58,9 +58,11 @@ export class GitHubHelper {
       }
     } catch (e) {
       if (
-        !e.message ||
-        !e.message.includes(`A pull request already exists for ${headBranch}`)
+        e.message &&
+        e.message.includes(`A pull request already exists for ${headBranch}`)
       ) {
+        core.info(`A pull request already exists for ${headBranch}`)
+      } else {
         throw e
       }
     }