merge updates from main, if there are any

Staffbase · Dec 1, 2021 · f418f7f · f418f7f
1 parent 9aee599
commit f418f7f
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 10 deletions.
diff --git a/dist/index.js b/dist/index.js
diff --git a/dist/index.js.map b/dist/index.js.map
diff --git a/src/autodev.ts b/src/autodev.ts
@@ -27,11 +27,6 @@ const autoDev = async (): Promise<void> => {
       branch: pull.head.ref
     }))
 
-  if (pulls.length === 0) {
-    info('🎉 No Pull Requests found. Nothing to merge.')
-    return
-  }
-
   await exec(`git config --global user.email "${email}"`)
   await exec(`git config --global user.name "${user}"`)
   await exec('git fetch')
@@ -50,6 +45,9 @@ const autoDev = async (): Promise<void> => {
   // only push to defined branch if there are changes
   if (await hasDiff('HEAD', `origin/${branch}`)) {
     await exec('git push -f')
+  } else if (pulls.length === 0) {
+    info('🎉 No Pull Requests found. Nothing to merge.')
+    return
   }
 
   info(message)