github-code/lvgl
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix release script

Browse Source
This commit is contained in:
Gabor Kiss-Vamosi
2020-08-18 10:53:01 +02:00
parent 1088492449
commit d665294669
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
scripts/release.py
View File

@@ -110,7 +110,7 @@ def clone_repos():
cmd("git clone " + upstream("lv_examples") + "; cd lv_examples; git checkout master") cmd("git clone " + upstream("lv_examples") + "; cd lv_examples; git checkout master")
cmd("git clone " + upstream("lv_drivers") + "; cd lv_drivers; git checkout master") cmd("git clone " + upstream("lv_drivers") + "; cd lv_drivers; git checkout master")
cmd("git clone --recurse-submodules " + upstream("docs") + "; cd docs; git checkout master") cmd("git clone --recurse-submodules " + upstream("docs") + "; cd docs; git checkout master")
cmd("git clone " + upstream("blog") + "; cd lv_drivers; git checkout blog") cmd("git clone " + upstream("blog") + "; cd blog; git checkout master")
def get_lvgl_version(br): def get_lvgl_version(br):
print("Get LVGL's version") print("Get LVGL's version")
@@ -313,10 +313,10 @@ def publish_master():
def merge_to_dev(): def merge_to_dev():
merge_cmd = "git checkout dev; git merge master -X ours; git checkout master" merge_cmd = "git checkout dev; git pull origin dev; git merge master -X ours; git checkout master"
cmd("cd lvgl; " + merge_cmd) cmd("cd lvgl; " + merge_cmd)
merge_cmd = "git checkout dev; git merge latest -X ours; git checkout master" merge_cmd = "git checkout dev --; git pull origin dev; git merge latest -X ours; git checkout master"
cmd("cd docs; " + merge_cmd) cmd("cd docs; " + merge_cmd)
@@ -324,7 +324,7 @@ def merge_from_dev():
merge_cmd = "git checkout master; git merge dev;" merge_cmd = "git checkout master; git merge dev;"
cmd("cd lvgl; " + merge_cmd) cmd("cd lvgl; " + merge_cmd)
merge_cmd = "git checkout latest; git merge dev;" merge_cmd = "git checkout latest -- ; git merge dev;"
cmd("cd docs; " + merge_cmd) cmd("cd docs; " + merge_cmd)