Skip to content

Commit 8679c6c

Browse files
committed
ci: Update auto-merge action to use squash merging
1 parent 876c5db commit 8679c6c

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

.github/workflows/auto-merge.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,9 +31,9 @@ jobs:
3131
env:
3232
PR_URL: ${{ github.event.pull_request.html_url }}
3333
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
34-
34+
3535
- name: Enable auto-merge
36-
run: gh pr merge --auto --merge "$PR_URL"
36+
run: gh pr merge --auto --squash "$PR_URL"
3737
env:
3838
PR_URL: ${{ github.event.pull_request.html_url }}
39-
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
39+
GH_TOKEN: ${{ secrets.PERSONAL_TOKEN }}

0 commit comments

Comments
 (0)