diff options
| author | Jean-François Milants <jf@codingfield.com> | 2021-02-23 20:40:02 (GMT) |
|---|---|---|
| committer | Jean-François Milants <jf@codingfield.com> | 2021-02-23 20:53:50 (GMT) |
| commit | 094f98743db630cf070d9fe97e14b24db6450112 (patch) | |
| tree | e7106bbcf902981ee6ac18364e319400b8a6bb86 /src/libs/lvgl/.github/workflows/merge-to-dev.yml | |
| parent | 67c545b1fbd368b99b111a1822fe8da815468e76 (diff) | |
Fix LVGL submodule (sorry!)
Diffstat (limited to 'src/libs/lvgl/.github/workflows/merge-to-dev.yml')
| m--------- | src/libs/lvgl | 0 | ||||
| -rw-r--r-- | src/libs/lvgl/.github/workflows/merge-to-dev.yml | 17 |
2 files changed, 0 insertions, 17 deletions
diff --git a/src/libs/lvgl b/src/libs/lvgl new file mode 160000 +Subproject b89c30eafe1397a778ae5d65f108a0ef820de12 diff --git a/src/libs/lvgl/.github/workflows/merge-to-dev.yml b/src/libs/lvgl/.github/workflows/merge-to-dev.yml deleted file mode 100644 index 997bb5d..0000000 --- a/src/libs/lvgl/.github/workflows/merge-to-dev.yml +++ /dev/null @@ -1,17 +0,0 @@ -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}} |