From bd39ee0f22bcc184739b55d0deead73561946f5a Mon Sep 17 00:00:00 2001 From: "phnx47[bot]" <78849906+phnx47-bot@users.noreply.github.com> Date: Wed, 1 Nov 2023 15:54:05 +0000 Subject: [PATCH] ci(automerge): squash -> rebase --- .github/workflows/automerge.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/automerge.yml b/.github/workflows/automerge.yml index fba8ea7..a6b68c1 100644 --- a/.github/workflows/automerge.yml +++ b/.github/workflows/automerge.yml @@ -12,7 +12,7 @@ permissions: jobs: automerge: - name: Enable PR auto-merge + name: Enable auto-merge runs-on: ubuntu-22.04 if: github.actor == 'phnx47-bot' && contains(github.event.pull_request.labels.*.name, 'sync') steps: @@ -20,6 +20,6 @@ jobs: uses: actions/checkout@v4 - name: Run command - run: gh pr merge -s --auto ${{ github.event.pull_request.number }} + run: gh pr merge -r --auto ${{ github.event.pull_request.number }} env: GH_TOKEN: ${{ secrets.GH_FULL_PAT }}