chore: Fix PR merge commands and include squash and delete-branch opt…

…ions
prvashisht · Jun 10, 2024 · f626608 · f626608
1 parent eca93c5
commit f626608
Showing 1 changed file with 1 addition and 2 deletions.
diff --git a/.github/workflows/release-extension.yaml b/.github/workflows/release-extension.yaml
@@ -111,11 +111,10 @@ jobs:
         commit-message: "Update README and CHANGELOG for v${{ needs.check_version.outputs.new_version }}"
         body: "This PR updates the README and CHANGELOG files for the new version v${{ needs.check_version.outputs.new_version }}."
         labels: documentation, release, github-actions
-        delete-branch: true
 
     - name: Merge Pull Request
       id: merge_pr
-      run: gh pr merge "${{ steps.create_pr.outputs.pull-request-number }}"
+      run: gh pr merge "${{ steps.create_pr.outputs.pull-request-number }}" --squash --delete-branch
       env:
         GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}