Update test_and_merge.yml

Author: baseplate-admin

.github/workflows/test_and_merge.yml

@@ -41,15 +41,10 @@ jobs:
     merge:
         runs-on: ubuntu-latest
         needs: [test]
-        if: github.actor == 'dependabot[bot]'
+        if: ${{ github.actor == 'dependabot[bot]' && github.event_name == 'pull_request'}} # Detect that the PR author is dependabot
         steps:
-          - name: Dependabot metadata
-            id: metadata
-            uses: dependabot/fetch-metadata@v2
-            with:
-              github-token: "${{ secrets.GITHUB_TOKEN }}"
           - name: Enable auto-merge for Dependabot PRs
-            run: gh pr merge --auto --merge "$PR_URL"
+            run: gh pr merge --auto --merge "$PR_URL" # Use Github CLI to merge automatically the PR
             env:
               PR_URL: ${{github.event.pull_request.html_url}}
-              GH_TOKEN: ${{secrets.GITHUB_TOKEN}}
+              GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN}}