diff options
| author | Jean-François Milants <jf@codingfield.com> | 2021-02-23 20:25:43 (GMT) |
|---|---|---|
| committer | Jean-François Milants <jf@codingfield.com> | 2021-02-23 20:25:43 (GMT) |
| commit | 67c545b1fbd368b99b111a1822fe8da815468e76 (patch) | |
| tree | 0bcb047f3e9d5c41c6d79b4dac6cbcdd3929136b /src/libs/lvgl/.github/workflows/merge-to-dev.yml | |
| parent | 324c7dab326ea23a6c8502bbb8c6e9b9d87a839f (diff) | |
| parent | b11b20b0ac5c0adfbd1397cf42c322c873a736a8 (diff) | |
Merge branch 'joaquimorg-LVGL7' into develop
Diffstat (limited to 'src/libs/lvgl/.github/workflows/merge-to-dev.yml')
| -rw-r--r-- | src/libs/lvgl/.github/workflows/merge-to-dev.yml | 17 |
1 files changed, 17 insertions, 0 deletions
diff --git a/src/libs/lvgl/.github/workflows/merge-to-dev.yml b/src/libs/lvgl/.github/workflows/merge-to-dev.yml new file mode 100644 index 0000000..997bb5d --- /dev/null +++ b/src/libs/lvgl/.github/workflows/merge-to-dev.yml @@ -0,0 +1,17 @@ +name: Merge master branch to dev +on: + push: + branches: + - 'master' +jobs: + merge-branch: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@master + - name: Merge to dev branch + uses: devmasx/merge-branch@v1.1.0 + with: + type: now + target_branch: 'dev' + env: + GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN}} |