mirror of
https://github.com/ynput/ayon-core.git
synced 2026-01-01 16:34:53 +01:00
replace merge action
This commit is contained in:
parent
1b969244f6
commit
73c6b322d4
1 changed files with 6 additions and 6 deletions
12
.github/workflows/nightly_merge.yml
vendored
12
.github/workflows/nightly_merge.yml
vendored
|
|
@ -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}'
|
||||||
Loading…
Add table
Add a link
Reference in a new issue