Merge branch 'master' of https://github.com/lvgl/lvgl

lvgl · Jun 7, 2021 · e796448 · e796448
2 parents ca54ecf + 4a0f413
commit e796448
Showing 4 changed files with 16 additions and 7 deletions.
diff --git a/.github/workflows/compile_docs.yml b/.github/workflows/compile_docs.yml
@@ -62,7 +62,7 @@ jobs:
         run: |
           echo "::set-output name=VERSION_NAME::$(scripts/find_version.sh)"
         id: version
-      - name: Deploy
+      - name: Deploy to subfolder
         uses: JamesIves/github-pages-deploy-action@3.7.1
         with:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
@@ -73,3 +73,15 @@ jobs:
           TARGET_FOLDER: ${{ steps.version.outputs.VERSION_NAME }}
           PRESERVE: true
           SINGLE_COMMIT: true
+      - name: Deploy to master
+        if: github.ref == 'refs/heads/master'
+        uses: JamesIves/github-pages-deploy-action@3.7.1
+        with:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          ACCESS_TOKEN: ${{ secrets.LVGL_BOT_TOKEN }}
+          REPOSITORY_NAME: lvgl/docs
+          BRANCH: gh-pages # The branch the action should deploy to.
+          FOLDER: out_html  # The folder the action should deploy.
+          TARGET_FOLDER: master
+          PRESERVE: true
+          SINGLE_COMMIT: true
diff --git a/README.md b/README.md
@@ -1,6 +1,3 @@
-**The master branch now contains the test version of v8. For the last v7 version use the release/v7 branch.** 
-
-
 <h1 align="center"> LVGL - Light and Versatile Graphics Library</h1>
 
 <p align="center">

diff --git a/docs/CHANGELOG.md b/docs/CHANGELOG.md
@@ -55,7 +55,7 @@ v8 is a major change and therefore it's not backward compatible with v7.
 
 ### Driver changes
 - `lv_disp_drv_t`, `lv_indev_drv_t`, `lv_fs_drv_t` needs to be `static`
-- `...disp_buf...` is renamed to `draw_buf`. See an initialization example [here](https://github.com/lvgl/lv_sim_eclipse_sdl/blob/e164e3591c3e1e3bf3464d19e0dcdc67b2e6a791/main.c#L87-L97).
+- `...disp_buf...` is renamed to `draw_buf`. See an initialization example [here](https://github.com/lvgl/lv_sim_eclipse_sdl/blob/release/v8.0/main.c#L128-L141).
 - No partial update if two screen sized buffers are set
 - `disp_drv->full_refresh = 1` makes always the whole display redraw. 
 - `hor_res` and `ver_res` need to be set in `disp_drv`

diff --git a/src/extra/README.md b/src/extra/README.md
@@ -13,10 +13,10 @@ In other words, if you have created a complex widget from other widgets, or modi
 - Add description in the [docs](https://github.com/lvgl/lvgl/tree/master/docs) 
 - Add [examples](https://github.com/lvgl/lvgl/tree/master/examples)
 - Update the [changelog](https://github.com/lvgl/lvgl/tree/master/docs/CHANGELOG.md)
-- Add yourself to the [Contributors](#contributors) section below.  :slight_smile:
+- Add yourself to the [Contributors](#contributors) section below.
 
 ## Ideas
-Here some ideas as inspiration feel free to contribute with ideas too :slight_smile:
+Here some ideas as inspiration feel free to contribute with ideas too. 
 - New [Calendar headers](https://github.com/lvgl/lvgl/tree/master/src/extra/widgets/calendar)
 - Color picker with RGB and or HSV bars
 - Ruler, horizontal or vertical with major and minor ticks and labels