diff --git a/.github/workflows/renovate-delegate.yaml b/.github/workflows/renovate-delegate.yaml index 1ec1ee5..b3547e7 100644 --- a/.github/workflows/renovate-delegate.yaml +++ b/.github/workflows/renovate-delegate.yaml @@ -1,17 +1,19 @@ -# Delegates reviewer permission to Renovate on its own PRs -name: Renovatebot Bors Delegate +# Merge using service account when renovate automerges +name: Renovatebot Bors Merge + on: - pull_request: - types: [opened] + issue_comment: + types: [created, edited, deleted] jobs: - bors-delegate: - if: ${{ github.actor == 'renovate[bot]' }} - name: Bors Delegate + service-account-merge: + if: ${{ contains( github.event.comment.body, 'service-account merge') && github.event.issue.pull_request && github.actor == 'renovate[bot]' }} + name: Service Account Merge runs-on: ubuntu-latest steps: - - name: Bors Delegate + - name: Merge Comment uses: thollander/actions-comment-pull-request@v1 with: - message: bors delegate+ - GITHUB_TOKEN: ${{ secrets.GH_SA_TOKEN }} \ No newline at end of file + message: bors merge + GITHUB_TOKEN: ${{ secrets.GH_SA_TOKEN }} + pr_number: ${{ github.event.issue.number }} \ No newline at end of file diff --git a/renovate.json b/renovate.json index 04a3b69..7123caa 100644 --- a/renovate.json +++ b/renovate.json @@ -1,4 +1,5 @@ { "$schema": "https://docs.renovatebot.com/renovate-schema.json", - "extends": ["github>voiceflow/renovate-config:integrations"] + "extends": ["github>voiceflow/renovate-config:integrations"], + "automergeComment": "serice-account merge" }