update changelog

CHANGELOG.md

@@ -2,13 +2,15 @@
 
 ## v7.4.0 (planned on 01.09.2020)
 
+The main new features of v7.4 are run-time font loading, style caching and arc knob with value setting by click.
+
 ### New features
-- arc: add set value by click feature
-- arc: add `LV_ARC_PART_KNOB` similarly to slider
-- send gestures even is the the obejct was dragged. User can check dragging with `lv_indev_is_dragging(lv_indev_act())` in the event function. 
 - Add `lv_font_load()` function - Loads a `lv_font_t` object from a binary font file
 - Add `lv_font_free()` function - Frees the memory allocated by the `lv_font_load()` function
 - Add style caching to reduce acces time of properties with default value
+- arc: add set value by click feature
+- arc: add `LV_ARC_PART_KNOB` similarly to slider
+- send gestures even is the the obejct was dragged. User can check dragging with `lv_indev_is_dragging(lv_indev_act())` in the event function. 
 
 ### Bugfixes
 - Fix color bleeding on border drawing

scripts/release.py

@@ -305,6 +305,17 @@ def update_release_branches():
     cmd("cd docs; " + merge_cmd)
     
 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 add .")
+    cmd("git commit -am 'Merge master'")
+    cmd("git push origin dev")
+    cmd("git checkout master")    
+    os.chdir("../")
+    
     pub_cmd = "git push origin master; git push origin " + ver_str
     cmd("cd lvgl; " + pub_cmd)    
     cmd("cd lv_examples; " + pub_cmd)