From 06336048a7a6d8ca7ba4f38f652d60d7423cbedd Mon Sep 17 00:00:00 2001 From: paketo-bot Date: Fri, 31 Jul 2020 15:54:14 +0000 Subject: [PATCH] Update github-config to 4d26ab4 --- .github/workflows/test-pull-request.yml | 4 +-- .mergify/config.yml | 34 +++++++++++++++++-------- 2 files changed, 25 insertions(+), 13 deletions(-) diff --git a/.github/workflows/test-pull-request.yml b/.github/workflows/test-pull-request.yml index 2e6df34..4f9802a 100644 --- a/.github/workflows/test-pull-request.yml +++ b/.github/workflows/test-pull-request.yml @@ -51,7 +51,7 @@ jobs: - name: Approve uses: paketo-buildpacks/github-config/actions/pull-request/approve@master with: - user: paketo-bot - token: ${{ secrets.PAKETO_BOT_GITHUB_TOKEN }} + user: paketo-bot-reviewer + token: ${{ secrets.PAKETO_BOT_REVIEWER_GITHUB_TOKEN }} author: ${{ steps.event.outputs.author }} number: ${{ steps.event.outputs.number }} diff --git a/.mergify/config.yml b/.mergify/config.yml index cf7f268..786c877 100644 --- a/.mergify/config.yml +++ b/.mergify/config.yml @@ -1,12 +1,24 @@ pull_request_rules: - - name: Auto merge pull requests from dependabot - conditions: - - author=dependabot[bot] - - status-success=Unit Tests - - status-success=Integration Tests - actions: - merge: - strict: smart - method: rebase - bot_account: paketo-bot - delete_head_branch: {} +- name: Auto merge pull requests from dependabot + conditions: + - author=dependabot[bot] + - status-success=Unit Tests + - status-success=Integration Tests + actions: + merge: + strict: smart + method: rebase + bot_account: paketo-bot + delete_head_branch: {} + +- name: Auto merge pull requests from paketo-bot + conditions: + - author=paketo-bot + - status-success=Unit Tests + - status-success=Integration Tests + actions: + merge: + strict: smart + method: rebase + bot_account: paketo-bot + delete_head_branch: {}