Skip to content

Commit 135a9e8

Browse files
committed
Different Merge PR action
1 parent eb074fd commit 135a9e8

File tree

1 file changed

+6
-5
lines changed

1 file changed

+6
-5
lines changed

.github/workflows/merge-bot-pr.yml

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,10 @@ jobs:
2020
checkInterval: 13
2121
env:
2222
GITHUB_TOKEN: "${{ secrets.PHPSTAN_BOT_TOKEN }}"
23-
- name: 'Merge'
24-
uses: "pascalgn/automerge-action@v0.4.0"
23+
- name: Merge Pull Request
24+
uses: juliangruber/merge-pull-request-action@v1
2525
if: steps.waitforstatuschecks.outputs.status == 'success'
26-
env:
27-
GITHUB_TOKEN: "${{ secrets.PHPSTAN_BOT_TOKEN }}"
28-
MERGE_METHOD: "rebase"
26+
with:
27+
github-token: "${{ secrets.PHPSTAN_BOT_TOKEN }}"
28+
number: "${{ github.event.number }}"
29+
method: rebase

0 commit comments

Comments
 (0)