Skip to content

Commit

Permalink
Don't automerge jaqx0r's changes as actions don't work on forks.
Browse files Browse the repository at this point in the history
See pascalgn/automerge-action#46 for gory details.

Hope springs from github/roadmap#107
  • Loading branch information
jaqx0r committed Dec 16, 2020
1 parent e0790be commit cc9e8a0
Showing 1 changed file with 5 additions and 5 deletions.
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"

0 comments on commit cc9e8a0

Please sign in to comment.