From a59c2a825fae87d8ebfc3946f47d4497051ff830 Mon Sep 17 00:00:00 2001 From: George Adams Date: Thu, 31 Jul 2025 11:22:19 +0100 Subject: [PATCH] Revert "Updating file .github/workflows/dependabot-auto-merge.yml (#179)" This reverts commit 6d89d8983b540f1bd7fdf3e21fc1db03c9cc2b75. --- .github/workflows/dependabot-auto-merge.yml | 35 ++++++++++++++++----- 1 file changed, 28 insertions(+), 7 deletions(-) diff --git a/.github/workflows/dependabot-auto-merge.yml b/.github/workflows/dependabot-auto-merge.yml index 6ecfa39..e4587c6 100644 --- a/.github/workflows/dependabot-auto-merge.yml +++ b/.github/workflows/dependabot-auto-merge.yml @@ -1,12 +1,33 @@ -# This is a templated file from https://github.com/adoptium/.eclipsefdn/tree/main/otterdog/policies/require_dependabot_auto_merge.yml name: Dependabot auto-merge -on: pull_request_target +on: workflow_call -permissions: read-all +permissions: + contents: write + pull-requests: write jobs: dependabot: - permissions: - contents: write - pull-requests: write - uses: adoptium/.github/.github/workflows/dependabot-auto-merge.yml@main + runs-on: ubuntu-latest + if: ${{ github.actor == 'dependabot[bot]' }} + steps: + - name: Dependabot metadata + id: metadata + uses: dependabot/fetch-metadata@dbb049abf0d677abbd7f7eee0375145b417fdd34 # v2.2.0 + with: + github-token: "${{ secrets.GITHUB_TOKEN }}" + + - name: Approve Dependabot PRs + # Don't approve semver major patches + if: ${{ steps.metadata.outputs.update-type == 'version-update:semver-patch' || steps.metadata.outputs.update-type == 'version-update:semver-minor' }} + run: gh pr review --approve "$PR_URL" + env: + PR_URL: ${{github.event.pull_request.html_url}} + GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN}} + + - name: Enable auto-merge for Dependabot PRs + # Don't merge semver major patches + if: ${{ steps.metadata.outputs.update-type == 'version-update:semver-patch' || steps.metadata.outputs.update-type == 'version-update:semver-minor' }} + run: gh pr merge --auto --squash "$PR_URL" + env: + PR_URL: ${{github.event.pull_request.html_url}} + GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN}}