Merge branch 'master' into dependabot/maven/aws.sdk.version-2.20.85

Author: jeromevdl

.github/workflows/auto-merge.yml

@@ -55,15 +55,12 @@ jobs:
               pull_number: issue_number,
               event: 'APPROVE'
             })
+            
+            github.pulls.merge({
+              owner: context.payload.repository.owner.login,
+              repo: context.payload.repository.name,
+              pull_number: issue_number,
+              merge_method: 'squash'
+            })
 
           github-token: ${{ secrets.AUTOMERGE }}
-      - name: Dependabot metadata
-        id: metadata
-        uses: dependabot/fetch-metadata@v1.1.1
-        with:
-          github-token: "${{ secrets.GITHUB_TOKEN }}"
-      - name: Enable auto-merge for Dependabot PRs
-        run: gh pr merge --auto --merge "$PR_URL"
-        env:
-          PR_URL: ${{github.event.pull_request.html_url}}
-          GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN}}