Skip to content

Commit 6aaf41b

Browse files
HavenDVclaude
andcommitted
chore: update auto-merge workflow to standard template
Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
1 parent 073a724 commit 6aaf41b

File tree

1 file changed

+5
-3
lines changed

1 file changed

+5
-3
lines changed

.github/workflows/auto-merge.yml

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ permissions:
1111
jobs:
1212
auto-merge:
1313
runs-on: ubuntu-latest
14-
if: ${{ (github.actor == 'dependabot[bot]' || github.actor == 'HavenDV') && github.repository_owner == 'tryAGI' }}
14+
if: ${{ github.event.pull_request.draft == false && (github.actor == 'dependabot[bot]' || github.actor == 'allcontributors[bot]' || github.actor == 'HavenDV') && github.repository_owner == 'tryAGI' }}
1515
steps:
1616
- name: Dependabot metadata
1717
if: ${{ github.actor == 'dependabot[bot]' }}
@@ -31,9 +31,11 @@ jobs:
3131
env:
3232
PR_URL: ${{ github.event.pull_request.html_url }}
3333
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
34-
34+
3535
- name: Enable auto-merge
3636
run: gh pr merge --auto --squash "$PR_URL"
3737
env:
3838
PR_URL: ${{ github.event.pull_request.html_url }}
39-
GH_TOKEN: ${{ secrets.PERSONAL_TOKEN }}
39+
# Use a non-GITHUB_TOKEN secret so the merge can trigger downstream workflows.
40+
# For dependabot PRs there are the empty secrets.PERSONAL_TOKEN so we use fallback.
41+
GH_TOKEN: ${{ secrets.PERSONAL_TOKEN || secrets.GITHUB_TOKEN }}

0 commit comments

Comments
 (0)