From 2614d1342ece013b189b06ad9dc28eab54002ae1 Mon Sep 17 00:00:00 2001
From: Gabor Kiss-Vamosi <kisvegabor@gmail.com>
Date: Tue, 15 Sep 2020 12:22:08 +0200
Subject: [PATCH] update relaese script

---
 scripts/release.py | 53 ++++++++++++++++++++++++----------------------
 1 file changed, 28 insertions(+), 25 deletions(-)

diff --git a/scripts/release.py b/scripts/release.py
index c06bf5292..0a4618d29 100755
--- a/scripts/release.py
+++ b/scripts/release.py
@@ -60,6 +60,10 @@ ver_major = -1
 ver_minor = -1
 ver_patch = -1
 
+dev_ver_major = -1
+dev_ver_minor = -1
+dev_ver_patch = -1
+
 ver_str = ""
 dev_ver_str = ""
 release_br = ""
@@ -108,14 +112,14 @@ def clone_repos():
     #cmd("cp -a ../repos/. .")
     #return
 
-    cmd("git clone " + upstream("lvgl") + "; cd lvgl; 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 --recurse-submodules " + upstream("docs") + "; cd docs; git checkout master")
-    cmd("git clone " + upstream("blog") + "; cd blog; git checkout master")
+    cmd("git clone " + upstream("lvgl") + "; cd lvgl; git checkout master; git remote update origin --prune; ")
+    cmd("git clone " + upstream("lv_examples") + "; cd lv_examples; git checkout master; git remote update origin --prune; ")
+    cmd("git clone " + upstream("lv_drivers") + "; cd lv_drivers; git checkout master; git remote update origin --prune; ")
+    cmd("git clone --recurse-submodules " + upstream("docs") + "; cd docs; git checkout master; git remote update origin --prune; ")
+    cmd("git clone " + upstream("blog") + "; cd blog; git checkout master; git remote update origin --prune; ")
 
     for p in proj_list:
-        cmd("git clone " + upstream(p) + " --recurse-submodules ; cd " + p + "; git checkout master")
+        cmd("git clone " + upstream(p) + " --recurse-submodules ; cd " + p + "; git checkout master; git remote update origin --prune; ")
         
 
 def get_lvgl_version(br):
@@ -309,7 +313,7 @@ def publish_master():
     #Merge LVGL master to dev first to avoid "merge-to-dev.yml" running asynchronous
     os.chdir("./lvgl")
     cmd("git checkout dev")
-    cmd("git merge master -X theirs")
+    cmd("git merge master -X ours")
     cmd("git add .")
     cmd("git commit -am 'Merge master'", False)
     cmd("git push origin dev")
@@ -326,22 +330,13 @@ def publish_master():
     cmd("cd docs; git checkout master; python 2.7 ./update.py " + release_br)
     
     pub_cmd = "git push origin master"
-    cmd("cd blog; " + pub_cmd)    
-    
-    
-def merge_to_dev():
-    merge_cmd = "git checkout dev; git pull origin dev; git merge master -X ours; git checkout master"
-    cmd("cd lvgl; " + merge_cmd)    
-    
-    merge_cmd = "git checkout dev --;  git pull origin dev; git merge latest -X ours; git checkout master"
-    cmd("cd docs; " + merge_cmd)    
-    
+    cmd("cd blog; " + pub_cmd)      
     
 def merge_from_dev():
     merge_cmd = "git checkout master; git merge dev;"
     cmd("cd lvgl; " + merge_cmd)    
     
-    merge_cmd = "git checkout latest -- ; git merge dev;"
+    merge_cmd = "git checkout latest -- ; git merge dev -X theirs --no-edit;"
     cmd("cd docs; " + merge_cmd)    
         
 
@@ -473,7 +468,14 @@ if __name__ == '__main__':
         exit(1)
      
     clone_repos()
-    get_lvgl_version("master")
+    get_lvgl_version("dev")
+    dev_ver_major = ver_major
+    dev_ver_minor = ver_minor
+    dev_ver_patch = ver_patch
+    dev_ver_str = ver_str
+    
+   get_lvgl_version("master")
+    
     lvgl_prepare()
     lv_examples_prepare() 
     lv_drivers_prepare()
@@ -482,7 +484,9 @@ if __name__ == '__main__':
     add_tags()
     update_release_branches()
     publish_master()
- 
+     
+    projs_update()    
+    
     if dev_prepare == 'bugfix': 
         ver_patch = str(int(ver_patch) + 1)
         ver_str = "v" + ver_major + "." + ver_minor + "." + ver_patch + "-dev"    
@@ -500,7 +504,10 @@ if __name__ == '__main__':
         docs_update_dev_version()
         publish_dev()
     else:
-        get_lvgl_version("dev")
+        #merge_from_dev()
+        
+        get_lvgl_version("master")
+        
         if dev_prepare == 'minor': 
             ver_minor = str(int(ver_minor) + 1)
             ver_patch = "0"
@@ -513,13 +520,9 @@ if __name__ == '__main__':
         
         print("Prepare minor version " + dev_ver_str)
 
-        merge_to_dev()
-        merge_from_dev()
-
         lvgl_update_dev_version()
         docs_update_dev_version()
         publish_dev_and_master()
         
-    projs_update()    
     cleanup()