Merge pull request #131 from tekktrik/bug/zephyr-board-ids

fix: correct handling of Zephyr boards

Author: tekktrik

circfirm/backend/github.py

@@ -17,7 +17,8 @@
     "X-GitHub-Api-Version": "2022-11-28",
 }
 
-BOARDS_REGEX = r"ports/.+/boards/([^/]+)"
+NONZEPHYR_BOARDS_REGEX = r"ports/(.+)/boards/([^/]+)"
+ZEPHYR_BOARDS_REGEX = r"ports/zephyr-cp/boards/(.+/[^/]+)"
 
 
 class RateLimit(TypedDict):
@@ -74,7 +75,15 @@ def get_board_id_list(token: str) -> list[str]:
     for tree_item in tree_items:
         if tree_item["type"] != "tree":
             continue
-        result = re.match(BOARDS_REGEX, tree_item["path"])
-        if result:
-            boards.add(result[1])
+
+        # Zephyr boards are organized differently, and require some modifications to the name
+        if zephyr_match := re.match(ZEPHYR_BOARDS_REGEX, tree_item["path"]):
+            result = zephyr_match[1].replace("/", "_")
+            boards.add(result)
+
+        # Non-Zephyr boards are all organized the same
+        elif nonzephyr_match := re.match(NONZEPHYR_BOARDS_REGEX, tree_item["path"]):
+            if nonzephyr_match[1] == "zephyr-cp":
+                continue
+            boards.add(nonzephyr_match[2])
     return sorted(boards)

tests/helpers.py

@@ -89,10 +89,26 @@ def copy_boot_out() -> None:
 def get_board_ids_from_git() -> list[str]:
     """Get a list of board IDs from the sandbox git repository."""
     ports_path = pathlib.Path("tests/sandbox/circuitpython")
-    board_paths = ports_path.glob("ports/*/boards/*")
-    return sorted(
-        [board_path.name for board_path in board_paths if board_path.is_dir()]
-    )
+
+    # Glob both Zephyr and non-Zephyr boards
+    nonzephyr_board_paths = ports_path.glob("ports/*/boards/*")
+    zephyr_board_paths = ports_path.glob("ports/zephyr-cp/boards/*/*")
+
+    # Remove Zephyr boards from the non-Zephyr list
+    nonzephyr_board_paths = [
+        board_path.name
+        for board_path in nonzephyr_board_paths
+        if "zephyr-cp" not in board_path.parts and board_path.is_dir()
+    ]
+
+    # Clean up the Zephyr boards
+    zephyr_board_paths = [
+        board_path.parent.name + "_" + board_path.name
+        for board_path in zephyr_board_paths
+        if board_path.is_dir()
+    ]
+
+    return sorted(nonzephyr_board_paths + zephyr_board_paths)
 
 
 def copy_default_config() -> str: