diff --git a/.github/workflows/auto-approver.yaml b/.github/workflows/auto-approver.yaml index f5b67511..b51c46db 100644 --- 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 index 9e699d7f..d87ccaeb 100644 --- a/renovate.json +++ b/renovate.json @@ -13,5 +13,6 @@ ], "automergeType": "pr", "rebaseWhen": "behind-base-branch", - "automerge": true + "automerge": true, + "additionalBranchPrefix": "auto-" } \ No newline at end of file