ci: move common functions to common_ext library

Signed-off-by: Frederic Pillon <[email protected]>

Author: fpistm

CI/update/stm32cube.py

@@ -15,6 +15,7 @@
 script_path = Path(__file__).parent.resolve()
 sys.path.append(str(script_path.parent))
 from utils import copyFile, copyFolder, createFolder, deleteFolder, genSTM32List
+from utils import execute_cmd, getRepoBranchName
 
 if sys.platform.startswith("win32"):
     from colorama import init
@@ -74,16 +75,6 @@
 out_separator = "-" * 70
 
 
-def execute_cmd(cmd, stderror):
-    try:
-        output = subprocess.check_output(cmd, stderr=stderror).decode("utf-8").strip()
-    except subprocess.CalledProcessError as e:
-        print("Failed command: ")
-        print(e.cmd)
-        exit(e.returncode)
-    return output
-
-
 def create_config(config_file_path):
     global repo_local_path
 
@@ -238,22 +229,6 @@ def createSystemFiles(serie):
     copyFile(hal_conf_file, hal_conf_default)
 
 
-def getRepoBranchName(repo_path):
-    bname = ""
-    rname = ""
-    cmd = ["git", "-C", repo_path, "branch", "-r"]
-    bnames = execute_cmd(cmd, None).split("\n")
-    for b in bnames:
-        name_match = re.match(r"\S+/\S+ -> (\S+)/(\S+)", b.strip())
-        if name_match:
-            rname = name_match.group(1)
-            bname = name_match.group(2)
-    if not bname:
-        print(f"Could not find branch name for {repo_path}!")
-        exit(1)
-    return (rname, bname)
-
-
 def updateCoreRepo():
     # Handle core repo
     repo_path = repo_local_path / repo_core_name

CI/utils/common_ext.py

@@ -1,4 +1,5 @@
 import re
+import subprocess
 import shutil
 import sys
 
@@ -52,6 +53,31 @@ def genSTM32List(path, pattern):
     return stm32_list
 
 
+def execute_cmd(cmd, stderror):
+    try:
+        output = subprocess.check_output(cmd, stderr=stderror).decode("utf-8").strip()
+    except subprocess.CalledProcessError as e:
+        print(f"Command {e.cmd} failed with error code {e.returncode}")
+        exit(e.returncode)
+    return output
+
+
+def getRepoBranchName(repo_path):
+    bname = ""
+    rname = ""
+    cmd = ["git", "-C", repo_path, "branch", "-r"]
+    bnames = execute_cmd(cmd, None).split("\n")
+    for b in bnames:
+        name_match = re.match(r"\S+/\S+ -> (\S+)/(\S+)", b.strip())
+        if name_match:
+            rname = name_match.group(1)
+            bname = name_match.group(2)
+    if not bname:
+        print(f"Could not find branch name for {repo_path}!")
+        exit(1)
+    return (rname, bname)
+
+
 if __name__ == "__main__":
     print("This script is not intend to be called directly")
     sys.exit()