don't fail checks if a PR already exists

tgymnich · Oct 27, 2021 · 941fd03 · 941fd03
1 parent 870ddf9
commit 941fd03
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 1 deletion.
diff --git a/lib/main.js b/lib/main.js
@@ -82,6 +82,10 @@ function run() {
             if (!!error.errors && !!error.errors[0] && !!error.errors[0].message && error.errors[0].message.startsWith('No commits between')) {
                 console.log('No commits between ' + context.repo.owner + ':' + base + ' and ' + owner + ':' + head);
             }
+            else if (!!error.errors && !!error.errors[0] && !!error.errors[0].message && error.errors[0].message.startsWith('A pull request already exists for')) {
+                // we were already done
+                console.log(error.errors[0].message);
+            }
             else {
                 if (!ignoreFail) {
                     core.setFailed(`Failed to create or merge pull request: ${error !== null && error !== void 0 ? error : "[n/a]"}`);

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "fork-sync",
-  "version": "1.6.2",
+  "version": "1.6.3",
   "private": true,
   "description": "Keep your fork up to date",
   "main": "lib/main.js",

diff --git a/src/main.ts b/src/main.ts
@@ -56,6 +56,9 @@ async function run() {
     }
     if (!!error.errors && !!error.errors[0] && !!error.errors[0].message && error.errors[0].message.startsWith('No commits between')) {
       console.log('No commits between ' + context.repo.owner + ':' + base + ' and ' + owner + ':' + head);
+    } else if (!!error.errors && !!error.errors[0] && !!error.errors[0].message && error.errors[0].message.startsWith('A pull request already exists for')) {
+      // we were already done
+      console.log(error.errors[0].message);
     } else {
       if (!ignoreFail) {
         core.setFailed(`Failed to create or merge pull request: ${error ?? "[n/a]"}`);