diff --git a/.github/workflows/automerge.yml b/.github/workflows/automerge.yml index 0108acc..275ad0b 100644 --- a/.github/workflows/automerge.yml +++ b/.github/workflows/automerge.yml @@ -11,11 +11,17 @@ on: jobs: merge-me: name: Merge me! + if: ${{ github.event.workflow_run.conclusion == 'success' }} runs-on: ubuntu-latest steps: + - name: Impersonate update bot + uses: tibdex/github-app-token@v1 + id: generate-token + with: + app_id: ${{ secrets.APP_ID }} + private_key: ${{ secrets.APP_PRIVATE_KEY }} - # It is often a desired behavior to merge only when a workflow execution # succeeds. This can be changed as needed. - if: ${{ github.event.workflow_run.conclusion == 'success' }} name: Merge me! uses: ridedott/merge-me-action@v2.10.32 with: @@ -29,7 +35,7 @@ jobs: # # This must be used as GitHub Actions token does not support pushing # to protected branches. - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + GITHUB_TOKEN: ${{ steps.generate-token.outputs.token }} MERGE_METHOD: MERGE PRESET: DEPENDABOT_MINOR ENABLED_FOR_MANUAL_CHANGES: 'true' diff --git a/newsfragments/75.misc.rst b/newsfragments/75.misc.rst new file mode 100644 index 0000000..2a5c006 --- /dev/null +++ b/newsfragments/75.misc.rst @@ -0,0 +1 @@ +Use github application and additional action to allow merge-me action to merge dependabot pull requests. \ No newline at end of file