From 706da959e8f6b4c723f06310efeb2403ab96017e Mon Sep 17 00:00:00 2001 From: Preston Date: Thu, 19 Aug 2021 21:55:20 -0400 Subject: [PATCH] Update autoMerge.yml --- .github/workflows/autoMerge.yml | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/.github/workflows/autoMerge.yml b/.github/workflows/autoMerge.yml index 93807f38..e384f26e 100644 --- a/.github/workflows/autoMerge.yml +++ b/.github/workflows/autoMerge.yml @@ -3,8 +3,11 @@ name: Auto Merge PR # Controls when the workflow will run on: # Triggers the workflow on push or pull request events but only for the development branch - pull_request: - types: [opened, synchronize, reopened] + pull_request_review: # try to merge after review + types: + - submitted + - edited + - dismissed # A workflow run is made up of one or more jobs that can run sequentially or in parallel jobs: @@ -15,11 +18,10 @@ jobs: # Steps represent a sequence of tasks that will be executed as part of the job steps: - - name: Enable GitHub Pull Reaquest Auto Merge Action + - name: Merge Pal # You may pin to the exact commit or the version. - # uses: poad/github-pull-request-auto-merge-enable-action@89573fd0a329b987282e63d3a81b1c2d260c6648 - uses: poad/github-pull-request-auto-merge-enable-action@v1.0.0 + # uses: maxkomarychev/merge-pal-action@7a3bca37e260865d9e9a259212c1d13ef4da7f41 + uses: maxkomarychev/merge-pal-action@v0.5.1 with: - github_token: ${{ secrets.GITHUB_TOKEN }} - owner: FreeTubeApp - repository: FreeTube + # Token to perform api calls + token: ${{ secrets.GITHUB_TOKEN }}