diff --git a/.github/workflows/auto-merge-dependabot.yml b/.github/workflows/auto-merge-dependabot.yml index c6b9b8031c..b5ada58301 100644 --- a/.github/workflows/auto-merge-dependabot.yml +++ b/.github/workflows/auto-merge-dependabot.yml @@ -1,25 +1,16 @@ -name: Dependabot Auto-Merge +name: Merge Dependabot PR + on: pull_request: branches: - - 'main' + - main + - '*.x' -permissions: - contents: write - pull-requests: write +run-name: Merge Dependabot PR ${{ github.ref_name }} jobs: - dependabot: - runs-on: ubuntu-latest - if: github.event.pull_request.user.login == 'dependabot[bot]' && github.repository == 'spring-projects/spring-security' - steps: - - name: Dependabot metadata - id: metadata - uses: dependabot/fetch-metadata@d7267f607e9d3fb96fc2fbe83e0af444713e90b7 - with: - github-token: ${{ github.token }} - - name: Enable auto-merge for Dependabot PRs - run: gh pr merge --auto --merge "$PR_URL" - env: - PR_URL: ${{ github.event.pull_request.html_url }} - GH_TOKEN: ${{ github.token }} + merge-dependabot-pr: + permissions: write-all + uses: spring-io/spring-github-workflows/.github/workflows/spring-merge-dependabot-pr.yml@v7 + with: + mergeArguments: --auto --rebase \ No newline at end of file