|
|
@ -1,4 +1,4 @@ |
|
|
|
name: 'Sync changes back to develop branch' |
|
|
|
name: 'Sync changes back to develop branch from master' |
|
|
|
|
|
|
|
|
|
|
|
on: |
|
|
|
on: |
|
|
|
# Triggered manually |
|
|
|
# Triggered manually |
|
|
@ -9,12 +9,15 @@ jobs: |
|
|
|
close-issues: |
|
|
|
close-issues: |
|
|
|
runs-on: ubuntu-latest |
|
|
|
runs-on: ubuntu-latest |
|
|
|
steps: |
|
|
|
steps: |
|
|
|
- uses: actions/checkout@master |
|
|
|
- name: Checkout |
|
|
|
|
|
|
|
uses: actions/checkout@v1 |
|
|
|
|
|
|
|
|
|
|
|
- name: Merge master -> develop |
|
|
|
- name: Merge from master to develop |
|
|
|
uses: devmasx/merge-branch@master |
|
|
|
uses: robotology/gh-action-nightly-merge@v1.3.1 |
|
|
|
with: |
|
|
|
with: |
|
|
|
type: now |
|
|
|
stable_branch: 'master' |
|
|
|
from_branch: master |
|
|
|
development_branch: 'develop' |
|
|
|
target_branch: develop |
|
|
|
allow_ff: true |
|
|
|
github_token: ${{ secrets.GITHUB_TOKEN }} |
|
|
|
allow_forks: true |
|
|
|
|
|
|
|
env: |
|
|
|
|
|
|
|
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} |