Merge pull request #18 from canonical/IAM-414

Fix auto merge logic
canonical · Sep 8, 2023 · f2c95c0 · f2c95c0
2 parents 3464338 + 7818909
commit f2c95c0
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/.github/workflows/auto-approver.yaml b/.github/workflows/auto-approver.yaml
@@ -17,9 +17,8 @@ jobs:
         env:
           GITHUB_TOKEN: ${{ secrets.PAT_TOKEN }}
       - name: Enable automerge if required
+        if: startsWith(github.ref_name, 'renovate/auto-')
         run: |
-          if [[ $(gh pr view --json body | grep "\*\*Automerge\*\*: Enabled") ]]; then
-            gh pr merge --auto --merge || true
-          fi
+          gh pr merge --auto --merge || true
         env:
           GITHUB_TOKEN: ${{ secrets.PAT_TOKEN }}
diff --git a/renovate.json b/renovate.json
@@ -13,5 +13,6 @@
   ],
   "automergeType": "pr",
   "rebaseWhen": "behind-base-branch",
-  "automerge": true
+  "automerge": true,
+  "additionalBranchPrefix": "auto-"
 }