Skip to content

Commit 7fdff6a

Browse files
committed
Use spring-github-workflows Auto-Merge
1 parent 117af3b commit 7fdff6a

1 file changed

Lines changed: 10 additions & 19 deletions

File tree

Lines changed: 10 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,16 @@
1-
name: Dependabot Auto-Merge
1+
name: Merge Dependabot PR
2+
23
on:
34
pull_request:
45
branches:
5-
- 'main'
6+
- main
7+
- '*.x'
68

7-
permissions:
8-
contents: write
9-
pull-requests: write
9+
run-name: Merge Dependabot PR ${{ github.ref_name }}
1010

1111
jobs:
12-
dependabot:
13-
runs-on: ubuntu-latest
14-
if: github.event.pull_request.user.login == 'dependabot[bot]' && github.repository == 'spring-projects/spring-security'
15-
steps:
16-
- name: Dependabot metadata
17-
id: metadata
18-
uses: dependabot/fetch-metadata@d7267f607e9d3fb96fc2fbe83e0af444713e90b7
19-
with:
20-
github-token: ${{ github.token }}
21-
- name: Enable auto-merge for Dependabot PRs
22-
run: gh pr merge --auto --merge "$PR_URL"
23-
env:
24-
PR_URL: ${{ github.event.pull_request.html_url }}
25-
GH_TOKEN: ${{ github.token }}
12+
merge-dependabot-pr:
13+
permissions: write-all
14+
uses: spring-io/spring-github-workflows/.github/workflows/spring-merge-dependabot-pr.yml@v7
15+
with:
16+
mergeArguments: --auto --rebase

0 commit comments

Comments
 (0)