From 4ce692eb8c6d213e98415c63ca6d34e28abd1715 Mon Sep 17 00:00:00 2001 From: Jan Raasch <425211+janraasch@users.noreply.github.com> Date: Tue, 23 Jan 2024 11:07:09 +0100 Subject: [PATCH] Approve & squash merge dependabot prs See https://dev.to/lkurzyniec/github-auto-merge-dependabot-prs-26dj --- .github/workflows/ci.yml | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index cb46add..f6f5b9f 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -24,13 +24,13 @@ jobs: - name: Build local ./exampleSite run: hugo --minify --gc --destination ../public --source ./exampleSite --themesDir ../.. --baseURL https://janraasch.github.io/hugo-bearblog/ - + - name: Upload Artifact uses: actions/upload-artifact@v4 with: name: build path: ./public - + dependabot: name: Dependabot Auto-Merge needs: build @@ -44,7 +44,9 @@ jobs: github-token: '${{ secrets.GITHUB_TOKEN }}' - name: Enable auto-merge for Dependabot PRs if: contains(fromJSON('["version-update:semver-patch", "version-update:semver-minor"]'), steps.dependabot-metadata.outputs.update-type) - run: gh pr merge --auto --merge "$PR_URL" + run: | + gh pr review --approve "$PR_URL" + gh pr merge --auto --squash "$PR_URL" env: PR_URL: ${{github.event.pull_request.html_url}} GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN}}