From 71b5f12c62b0cdfc94aa442a37071b85d02558b5 Mon Sep 17 00:00:00 2001 From: Joas Schilling Date: Fri, 14 Feb 2025 23:02:47 +0100 Subject: [PATCH] ci: Try the original action that doesn't squash Signed-off-by: Joas Schilling --- .github/workflows/dependabot-approve-merge.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/dependabot-approve-merge.yml b/.github/workflows/dependabot-approve-merge.yml index 2c6fbec..3063396 100644 --- a/.github/workflows/dependabot-approve-merge.yml +++ b/.github/workflows/dependabot-approve-merge.yml @@ -27,9 +27,9 @@ jobs: if: github.event.pull_request.user.login == 'dependabot[bot]' || github.event.pull_request.user.login == 'renovate[bot]' runs-on: ubuntu-latest-low permissions: - # hmarr/auto-approve-action + # for hmarr/auto-approve-action to approve PRs pull-requests: write - # fastify/github-action-merge-dependabot + # for alexwilson/enable-github-automerge-action to approve PRs contents: write steps: @@ -45,7 +45,7 @@ jobs: github-token: ${{ secrets.GITHUB_TOKEN }} # Nextcloud bot approve and merge request - - uses: fastify/github-action-merge-dependabot@c3bde0759d4f24db16f7b250b2122bc2df57e817 # v3.11.0 + - uses: ahmadnassri/action-dependabot-auto-merge@45fc124d949b19b6b8bf6645b6c9d55f4f9ac61a # v2 with: - target: 'minor' - use-github-auto-merge: true + target: minor + github-token: ${{ secrets.GITHUB_TOKEN }}