File tree Expand file tree Collapse file tree 1 file changed +9
-6
lines changed
Expand file tree Collapse file tree 1 file changed +9
-6
lines changed Original file line number Diff line number Diff line change @@ -20,10 +20,13 @@ jobs:
2020
2121 - name : " Checkout"
2222 uses : actions/checkout@34e114876b0b11c390a56381ad16ebd13914f8d5 # v4.3.1
23- - name : " Merge branch"
24- uses : everlytic/branch-merge@c4a244dc23143f824ae6c022a10732566cb8e973 # 1.1.5
2523 with :
26- github_token : " ${{ secrets.PHPSTAN_BOT_TOKEN }}"
27- source_ref : ${{ github.ref }}
28- target_branch : ' 2.2.x'
29- commit_message_template : ' Merge branch {source_ref} into {target_branch}'
24+ fetch-depth : 0
25+ ref : ' 2.2.x'
26+ token : " ${{ secrets.PHPSTAN_BOT_TOKEN }}"
27+ - name : " Merge branch"
28+ run : |
29+ git config user.name "phpstan-bot"
30+ git config user.email "bot@phpstan.org"
31+ git merge --strategy=ort origin/${{ github.ref_name }} -m "Merge branch ${{ github.ref_name }} into 2.2.x"
32+ git push
You can’t perform that action at this time.
0 commit comments