|
|
@ -9,16 +9,11 @@ jobs: |
|
|
|
sync-to-develop: |
|
|
|
sync-to-develop: |
|
|
|
runs-on: ubuntu-latest |
|
|
|
runs-on: ubuntu-latest |
|
|
|
steps: |
|
|
|
steps: |
|
|
|
# See https://github.com/actions/checkout/issues/766 |
|
|
|
|
|
|
|
- name: Workaround for unsafe repository issue |
|
|
|
|
|
|
|
run: | |
|
|
|
|
|
|
|
git config --global --add safe.directory ${GITHUB_WORKSPACE} |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
- name: Checkout |
|
|
|
- name: Checkout |
|
|
|
uses: actions/checkout@v1 |
|
|
|
uses: actions/checkout@v1 |
|
|
|
|
|
|
|
|
|
|
|
- name: Merge from master to develop |
|
|
|
- name: Merge from master to develop |
|
|
|
uses: robotology/gh-action-nightly-merge@v1.3.1 |
|
|
|
uses: wingkwong/gh-action-nightly-merge@master |
|
|
|
with: |
|
|
|
with: |
|
|
|
stable_branch: 'master' |
|
|
|
stable_branch: 'master' |
|
|
|
development_branch: 'develop' |
|
|
|
development_branch: 'develop' |
|
|
|