🎨 Add early exit if there was no successful merge (#265)

* 🎨 Add early exit if there was no successful merge

* 🔖 Create new version

* 👷 Using new credentials

* 🚀 Update dist folder

Author: flaxel

.github/workflows/integration.yml

@@ -37,7 +37,7 @@ jobs:
       - name: Execute Action
         uses: ./
         with:
-          token: ${{ secrets.DEV_PUSH_TOKEN }}
+          token: ${{ secrets.GITHUB_TOKEN }}
           user: ${{ secrets.DEV_PUSH_USER }}
           labels: true
           comments: true

README.md

@@ -28,7 +28,7 @@ jobs:
           fetch-depth: 0
 
       - name: Autodev
-        uses: Staffbase/[email protected].1
+        uses: Staffbase/[email protected].2
         with:
           # The token used to fetch the pull requests from the GitHub API
           token: ${{ secrets.PERSONAL_ACCESS_TOKEN }}
@@ -59,7 +59,7 @@ Always create the dev branch.
 
 ```yaml
 - name: Autodev
-  uses: Staffbase/[email protected].1
+  uses: Staffbase/[email protected].2
   with:
     token: ${{ secrets.PERSONAL_ACCESS_TOKEN }}
 ```
@@ -68,7 +68,7 @@ Add a status comment if the merge was successful or failed.
 
 ```yaml
 - name: Autodev
-  uses: Staffbase/[email protected].1
+  uses: Staffbase/[email protected].2
   with:
     token: ${{ secrets.PERSONAL_ACCESS_TOKEN }}
     comments: true
@@ -80,7 +80,7 @@ Add a status label if the merge was successful or failed.
 
 ```yaml
 - name: Autodev
-  uses: Staffbase/[email protected].1
+  uses: Staffbase/[email protected].2
   with:
     token: ${{ secrets.PERSONAL_ACCESS_TOKEN }}
     labels: true

dist/index.js

@@ -1,6 +1,6 @@
 {
   "name": "autodev-action",
-  "version": "v1.8.1",
+  "version": "v1.8.2",
   "description": "Github Action that tries to merge all commits from a PR with the dev label into the dev branch.",
   "main": "lib/index.js",
   "scripts": {

dist/index.js.map

@@ -162,8 +162,6 @@ const merge = async (
       failed.push(pull)
     }
   }
-  await exec(`git reset origin/${base}`)
-  await exec('git add -A')
 
   const overrideDate = {
     env: {
@@ -183,6 +181,13 @@ const merge = async (
     `The following branches have been merged:\n${successList}\n\n` +
     `The following branches failed to merge:\n${failList}`
 
+  if (success.length === 0) {
+    return message
+  }
+
+  await exec(`git reset origin/${base}`)
+  await exec('git add -A')
+
   await exec('git commit -m', [message], overrideDate)
   // replace with graft commit so we can preserve commit parents
   await exec(
@@ -192,8 +197,10 @@ const merge = async (
   )
   const rev = await execAndSlurp('git rev-parse HEAD')
   await exec(`git checkout replace/${rev}`)
+
   await comment(success)
   await label(success)
+
   return message
 }