Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Don't automerge jaqx0r's changes as actions don't work on forks. #370

Merged
merged 1 commit into from
Dec 16, 2020
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions .github/workflows/automerge.yml
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
# This doesn't work on forked repos per the discussion in
# https://github.com/pascalgn/automerge-action/issues/46 so don't attempt to
# add people other than dependabot to the if field below.
name: automerge
on:
pull_request:
Expand All @@ -22,14 +25,11 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: automerge
if: github.actor == 'jaqx0r' || github.actor == 'dependabot[bot]'
if: github.actor == 'dependabot[bot]'
uses: "pascalgn/[email protected]"
with:
args: "--trace"
env:
GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}"
MERGE_METHOD: "merge"
MERGE_METHOD: "rebase"
MERGE_LABELS: ""
MERGE_FORKS: "true"
MERGE_RETRY_SLEEP: "60000"
MERGE_RETRIES: "61"