From 6a837ac428944c9ad2851538e1211aa1bce624c4 Mon Sep 17 00:00:00 2001 From: oakbrad Date: Sat, 1 Jun 2024 20:18:30 -0700 Subject: [PATCH] #24 Fix automerge action --- .github/workflows/auto-approve-imgbot.yml | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/.github/workflows/auto-approve-imgbot.yml b/.github/workflows/auto-approve-imgbot.yml index a5a8c62..45768ad 100644 --- a/.github/workflows/auto-approve-imgbot.yml +++ b/.github/workflows/auto-approve-imgbot.yml @@ -9,9 +9,9 @@ jobs: name: Auto Approve a PR by imgbot # Name of the job runs-on: ubuntu-latest # Environment on which the job runs steps: - - name: Auto approve + - name: Auto approve imgbot uses: hmarr/auto-approve-action@v2.0.0 # Custom action for auto approval already available on marketplace - # Perform the auto approve action only when the PR is raised by dependabot + # Perform the auto approve action only when the PR is raised by imgbot if: github.actor == 'imgbot[bot]' || github.actor == 'ImgBot[bot]' with: # Create a personal access token and store it under the Secrets section of the particular repository @@ -24,11 +24,15 @@ jobs: needs: autoapprove runs-on: ubuntu-latest steps: - - name: Auto merge + - id: automerge + name: Auto merge # Custom action for auto merging already available on marketplace - uses: pascalgn/automerge-action@135f0bdb927d9807b5446f7ca9ecc2c51de03c4a - # Perform the auto merge action only when the PR is raised by dependabot + uses: "pascalgn/automerge-action@v0.16.3" + # Perform the auto merge action only when the PR is raised by imgbot if: github.actor == 'imgbot[bot]' || github.actor == 'ImgBot[bot]' env: GITHUB_TOKEN: ${{ secrets.ACTIONS_TOKEN }} - MERGE_METHOD: rebase \ No newline at end of file + MERGE_METHOD: rebase + UPDATE_LABEL: "" + MERGE_LABELS: "!x" + MERGE_ERROR_FAIL: "true" \ No newline at end of file