From 4ca4aa93314060480ecc27a401293c4e6d7ad831 Mon Sep 17 00:00:00 2001 From: Nikos Kontakis Date: Tue, 26 Sep 2023 13:04:16 +0300 Subject: [PATCH 1/2] automerge --- .github/workflows/auto-merge.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/auto-merge.yml b/.github/workflows/auto-merge.yml index 0fd232612..bbdf8cd79 100644 --- a/.github/workflows/auto-merge.yml +++ b/.github/workflows/auto-merge.yml @@ -13,5 +13,5 @@ jobs: - uses: actions/checkout@v4 - uses: ahmadnassri/action-dependabot-auto-merge@v2 with: - target: minor + target: semver:minor github-token: ${{ secrets.DEPENDABOT_TOKEN }} From b32d4a2daff3974378299701ea81a1a1c2b9920c Mon Sep 17 00:00:00 2001 From: Nikos Kontakis Date: Wed, 27 Sep 2023 13:41:45 +0300 Subject: [PATCH 2/2] Check auto-approval --- .github/workflows/auto-merge.yml | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/.github/workflows/auto-merge.yml b/.github/workflows/auto-merge.yml index bbdf8cd79..c4279fd4c 100644 --- a/.github/workflows/auto-merge.yml +++ b/.github/workflows/auto-merge.yml @@ -1,17 +1,23 @@ -name: Dependabot Auto Merge +name: Dependabot Auto Approve/Merge on: pull_request permissions: - contents: write pull-requests: write jobs: auto-merge: runs-on: ubuntu-latest + if: ${{ github.actor == 'dependabot[bot]' }} steps: - - uses: actions/checkout@v4 - - uses: ahmadnassri/action-dependabot-auto-merge@v2 + - name: Dependabot metadata + id: dependabot-metadata + uses: dependabot/fetch-metadata@v1 with: - target: semver:minor - github-token: ${{ secrets.DEPENDABOT_TOKEN }} + github-token: "${{ secrets.DEPENDABOT_TOKEN }}" + - name: Approve the PR + if: ${{ steps.dependabot-metadata.outputs.update-type == 'version-update:semver-patch' || steps.dependabot-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.DEPENDABOT_TOKEN}}