Skip to content

Commit

Permalink
Fix auto-merging bot PRs (#501)
Browse files Browse the repository at this point in the history
  • Loading branch information
akihironitta authored Feb 10, 2025
1 parent 652b573 commit 46ad1b3
Showing 1 changed file with 6 additions and 5 deletions.
11 changes: 6 additions & 5 deletions .github/workflows/dependabot-auto-merge.yml
Original file line number Diff line number Diff line change
@@ -1,9 +1,8 @@
name: Dependabot auto-merge

on: # yamllint disable-line rule:truthy
pull_request:
branches:
- master
pull_request_target:
types: [opened, synchronize]

permissions:
contents: write
Expand All @@ -17,12 +16,14 @@ jobs:
- name: Label bot PRs
run: gh pr edit --add-label "ci,skip-changelog" ${{ github.event.pull_request.html_url }}
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
GITHUB_TOKEN: ${{ secrets.PAT }}

- name: Auto-approve
uses: hmarr/auto-approve-action@v4
with:
github-token: ${{ secrets.PAT }}

- name: Enable auto-merge
run: gh pr merge --auto --squash ${{ github.event.pull_request.html_url }}
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
GITHUB_TOKEN: ${{ secrets.PAT }}

0 comments on commit 46ad1b3

Please sign in to comment.