replace merge action

This commit is contained in:
Milan Kolar 2021-06-07 09:58:58 +02:00
parent 1b969244f6
commit 73c6b322d4

View file

@ -14,10 +14,10 @@ jobs:
- name: 🚛 Checkout Code - name: 🚛 Checkout Code
uses: actions/checkout@v2 uses: actions/checkout@v2
- name: Merge development -> main - name: 🔨 Merge main back to develop
uses: devmasx/merge-branch@v1.3.1 uses: everlytic/branch-merge@1.1.0
with: with:
type: now github_token: ${{ secrets.ADMIN_TOKEN }}
from_branch: develop source_ref: 'develop'
target_branch: main target_branch: 'main'
github_token: ${{ secrets.ADMIN_TOKEN }} commit_message_template: '[Automated] Merged {source_ref} into {target_branch}'