fix(release_updater): minor fixes and addition of new boards (#7726)
Arduino Lint / lint (push) Waiting to run
MicroPython CI / Build esp32 port (push) Waiting to run
MicroPython CI / Build rp2 port (push) Waiting to run
MicroPython CI / Build stm32 port (push) Waiting to run
MicroPython CI / Build unix port (push) Waiting to run
C/C++ CI / Build OPTIONS_16BIT - Ubuntu (push) Waiting to run
C/C++ CI / Build OPTIONS_24BIT - Ubuntu (push) Waiting to run
C/C++ CI / Build OPTIONS_FULL_32BIT - Ubuntu (push) Waiting to run
C/C++ CI / Build OPTIONS_NORMAL_8BIT - Ubuntu (push) Waiting to run
C/C++ CI / Build OPTIONS_SDL - Ubuntu (push) Waiting to run
C/C++ CI / Build OPTIONS_VG_LITE - Ubuntu (push) Waiting to run
C/C++ CI / Build OPTIONS_16BIT - cl - Windows (push) Waiting to run
C/C++ CI / Build OPTIONS_16BIT - gcc - Windows (push) Waiting to run
C/C++ CI / Build OPTIONS_24BIT - cl - Windows (push) Waiting to run
C/C++ CI / Build OPTIONS_24BIT - gcc - Windows (push) Waiting to run
C/C++ CI / Build OPTIONS_FULL_32BIT - cl - Windows (push) Waiting to run
C/C++ CI / Build OPTIONS_FULL_32BIT - gcc - Windows (push) Waiting to run
C/C++ CI / Build OPTIONS_VG_LITE - cl - Windows (push) Waiting to run
C/C++ CI / Build OPTIONS_VG_LITE - gcc - Windows (push) Waiting to run
C/C++ CI / Build ESP IDF ESP32S3 (push) Waiting to run
C/C++ CI / Run tests with 32bit build (push) Waiting to run
C/C++ CI / Run tests with 64bit build (push) Waiting to run
BOM Check / bom-check (push) Waiting to run
Verify that lv_conf_internal.h matches repository state / verify-conf-internal (push) Waiting to run
Verify the widget property name / verify-property-name (push) Waiting to run
Verify code formatting / verify-formatting (push) Waiting to run
Build docs / build-and-deploy (push) Waiting to run
Test API JSON generator / Test API JSON (push) Waiting to run
Check Makefile / Build using Makefile (push) Waiting to run
Check Makefile for UEFI / Build using Makefile for UEFI (push) Waiting to run
Port repo release update / run-release-branch-updater (push) Waiting to run
Verify Kconfig / verify-kconfig (push) Waiting to run

Co-authored-by: Liam Howatt <30486941+liamHowatt@users.noreply.github.com>
This commit is contained in:
Gabor Kiss-Vamosi
2025-02-25 17:42:11 +01:00
committed by GitHub
parent 8f6713c185
commit ab07080f01
2 changed files with 31 additions and 13 deletions
+23 -13
View File
@@ -47,7 +47,11 @@ def main():
for url in urls:
print(LOG, "working with port:", url)
subprocess.check_call(("git", "clone", url, port_clone_tmpdir))
if dry_run:
port_clone_tmpdir = url[len("https://github.com/lvgl/"): ]
print("port_clone_tmpdir: " + port_clone_tmpdir)
subprocess.run(("git", "clone", url, port_clone_tmpdir))
port_release_branches, port_default_branch = get_release_branches(port_clone_tmpdir)
print(LOG, "port release branches:", ", ".join(fmt_release(br) for br in port_release_branches) or "(none)")
@@ -78,7 +82,7 @@ def main():
# the closest minor of the same major.
if port_branch in port_release_branches:
print(LOG, "... this port has a matching release branch.")
subprocess.check_call(("git", "-C", port_clone_tmpdir, "branch", "--track",
subprocess.run(("git", "-C", port_clone_tmpdir, "branch", "--track",
fmt_release(port_branch),
f"origin/{fmt_release(port_branch)}"))
elif port_branch != port_default_branch:
@@ -100,10 +104,12 @@ def main():
print(LOG, f"... creating the new branch {fmt_release(port_branch)} "
f"from {fmt_release(create_from)}")
subprocess.check_call(("git", "-C", port_clone_tmpdir, "branch",
res = subprocess.run(("git", "-C", port_clone_tmpdir, "branch",
fmt_release(port_branch), # new branch name
fmt_release(create_from))) # start point
if res.returncode != 0: continue
port_release_branches.append(port_branch)
port_release_branches.sort()
@@ -112,14 +118,17 @@ def main():
subprocess.check_call(("git", "-C", port_clone_tmpdir, "checkout", fmt_release(port_branch)))
# update the submodule in the port if it exists
out = subprocess.check_output(("git", "-C", port_clone_tmpdir, "config", "--file",
".gitmodules", "--get-regexp", "path"))
port_lvgl_submodule_path = next((
line.partition("lvgl.path ")[2]
for line
in out.decode().strip().splitlines()
if "lvgl.path " in line
), None)
port_lvgl_submodule_path = None
if os.path.exists(os.path.join(port_clone_tmpdir, ".gitmodules")):
out = subprocess.check_output(("git", "-C", port_clone_tmpdir, "config", "--file",
".gitmodules", "--get-regexp", "path"))
port_lvgl_submodule_path = next((
line.partition("lvgl.path ")[2]
for line
in out.decode().strip().splitlines()
if "lvgl.path " in line
), None)
if port_lvgl_submodule_path is None:
print(LOG, "this port has no LVGL submodule")
else:
@@ -186,7 +195,7 @@ def main():
+ (" lv_conf.h." if port_lv_conf_h_was_updated else "")
)
print(LOG, f"commit message: '{commit_msg}'")
subprocess.check_call(("git", "-C", port_clone_tmpdir, "commit", "-m", commit_msg))
subprocess.check_call(("git", "-C", port_clone_tmpdir, "commit", "--allow-empty", "-m", commit_msg))
if dry_run:
print(LOG, "this is a dry run so nothing will be pushed")
else:
@@ -198,7 +207,8 @@ def main():
else:
print(LOG, "nothing to push for this release. it is up to date.")
shutil.rmtree(port_clone_tmpdir)
if not dry_run:
shutil.rmtree(port_clone_tmpdir)
print(LOG, "port update complete:", url)