Skip to content

Commit

Permalink
#24 Fix automerge action
Browse files Browse the repository at this point in the history
  • Loading branch information
oakbrad committed Jun 2, 2024
1 parent 1bebf8a commit 6a837ac
Showing 1 changed file with 10 additions and 6 deletions.
16 changes: 10 additions & 6 deletions .github/workflows/auto-approve-imgbot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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/[email protected] # 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
Expand All @@ -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
MERGE_METHOD: rebase
UPDATE_LABEL: ""
MERGE_LABELS: "!x"
MERGE_ERROR_FAIL: "true"

0 comments on commit 6a837ac

Please sign in to comment.