From 4b21fc52c5645941f4a67fbf7ea3acf32942116e Mon Sep 17 00:00:00 2001 From: Antonin Bas Date: Mon, 16 Oct 2023 11:18:07 -0700 Subject: [PATCH] Fix dependabot_automerge.yml workflow Use squash instead of merge. Signed-off-by: Antonin Bas --- .github/workflows/dependabot_automerge.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/dependabot_automerge.yml b/.github/workflows/dependabot_automerge.yml index 4408c02b..4d48a263 100644 --- a/.github/workflows/dependabot_automerge.yml +++ b/.github/workflows/dependabot_automerge.yml @@ -17,7 +17,7 @@ jobs: github-token: "${{ secrets.GITHUB_TOKEN }}" - name: Enable auto-merge for npm Dependabot PRs (except major updates) if: ${{ steps.metadata.outputs.package-ecosystem == 'npm_and_yarn' && steps.metadata.outputs.update-type != 'version-update:semver-major' }} - run: gh pr merge --auto --merge "$PR_URL" + run: gh pr merge --auto --squash "$PR_URL" env: PR_URL: ${{github.event.pull_request.html_url}} GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN}}