Skip to content

Commit 6680d9c

Browse files
Update auto_merge.yml
Auto rebase dependabot PRs
1 parent c6f8e38 commit 6680d9c

File tree

1 file changed

+16
-1
lines changed

1 file changed

+16
-1
lines changed

.github/workflows/auto_merge.yml

Lines changed: 16 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,12 @@
11
# https://docs.github.com/en/code-security/dependabot/working-with-dependabot/automating-dependabot-with-github-actions#approve-a-pull-request
22

33
name: auto_merge
4-
on: [pull_request, workflow_dispatch] # pull_request, push, workflow_dispatch
4+
on: # pull_request, push, workflow_dispatch
5+
pull_request:
6+
workflow_dispatch:
7+
push:
8+
release:
9+
types: [published]
510

611
permissions:
712
pull-requests: write
@@ -25,3 +30,13 @@ jobs:
2530
run: gh pr merge "$PR_URL" --auto --squash
2631
env:
2732
PR_URL: ${{ github.event.pull_request.html_url }}
33+
auto-rebase:
34+
name: rebase dependabot PRs
35+
runs-on: ubuntu-latest
36+
if: github.ref == 'refs/heads/main' || github.event == 'release'
37+
timeout-minutes: 5
38+
steps:
39+
- name: rebase
40+
uses: "bbeesley/gha-auto-dependabot-rebase@main"
41+
env:
42+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

0 commit comments

Comments
 (0)