1
0
mirror of https://github.com/lvgl/lvgl.git synced 2025-01-14 06:42:58 +08:00

Merge ec7397e4a0267b2d0dbe662b213bf37bff70b243 into dev

This commit is contained in:
github-actions[bot] 2020-08-04 07:50:33 +00:00 committed by GitHub
commit 243c448df9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -210,10 +210,18 @@ def docs_update_version(v):
cmd("git add conf.py")
cmd('git ci -m "update conf.py to ' + v + '"')
def docs_merge_to_release_branch(v):
title("docs: merge to release branch")
cmd('git co release/v7 --')
cmd('git clean -fd .')
cmd('git merge latest')
cmd('git push origin release/v7')
def docs_build():
title("docs: Build")
cmd("git checkout master")
cmd("./update.py latest")
cmd("./update.py latest release/v7")
def clean_up():
title("Clean up repos")
@ -240,6 +248,7 @@ drivers_merge_to_release_branch(ver_str)
docs_clone()
docs_get_api()
docs_update_version(ver_str)
docs_merge_to_release_branch(v):
docs_build()
clean_up()