Browse Source

fix: sync changes from master to develop with ff

Signed-off-by: Wing-Kam Wong <wingkwong.code@gmail.com>
pull/1281/head
Wing-Kam Wong 3 years ago
parent
commit
46df5e2934
  1. 19
      .github/workflows/sync-to-develop.yml

19
.github/workflows/sync-to-develop.yml

@ -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 }}
Loading…
Cancel
Save