Frame13/ayon-core
1
0
Fork 1
mirror of https://github.com/ynput/ayon-core.git synced 2025-12-24 12:54:40 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

replace merge action

Browse source
This commit is contained in:
Milan Kolar 2021-06-07 09:58:58 +02:00
parent 1b969244f6
commit 73c6b322d4
1 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

12
.github/workflows/nightly_merge.yml vendored
View file

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