From a17c9fd1d3edd56ae64c42b0f855230eed0088be Mon Sep 17 00:00:00 2001
From: "J. Nick Koston" <nick@home-assistant.io>
Date: Wed, 8 Oct 2025 16:17:42 -1000
Subject: [PATCH] adj

---
 script/merge_component_configs.py | 33 ++++++++++++++++++++++++++++---
 script/split_components_for_ci.py | 14 +++++++------
 2 files changed, 38 insertions(+), 9 deletions(-)

diff --git a/script/merge_component_configs.py b/script/merge_component_configs.py
index 94c7720079..a334335ce4 100755
--- a/script/merge_component_configs.py
+++ b/script/merge_component_configs.py
@@ -16,6 +16,7 @@ The merger handles:
 from __future__ import annotations
 
 import argparse
+from functools import lru_cache
 from pathlib import Path
 import re
 import sys
@@ -28,6 +29,24 @@ from esphome import yaml_util
 from esphome.config_helpers import merge_config
 
 
+@lru_cache(maxsize=1)
+def get_common_bus_packages() -> frozenset[str]:
+    """Get the list of common bus package names.
+
+    Reads from tests/test_build_components/common/ directory
+    and caches the result.
+
+    Returns:
+        Frozenset of common bus package names (i2c, spi, uart, etc.)
+    """
+    common_dir = Path("tests/test_build_components/common")
+    if not common_dir.exists():
+        return frozenset()
+
+    # List all directories in common/ - these are the bus package names
+    return frozenset(d.name for d in common_dir.iterdir() if d.is_dir())
+
+
 def load_yaml_file(yaml_file: Path) -> dict:
     """Load YAML file using ESPHome's YAML loader.
 
@@ -44,21 +63,29 @@ def load_yaml_file(yaml_file: Path) -> dict:
 
 
 def extract_packages_from_yaml(data: dict) -> dict[str, str]:
-    """Extract package includes from parsed YAML.
+    """Extract COMMON BUS package includes from parsed YAML.
+
+    Only extracts packages that are from test_build_components/common/,
+    ignoring component-specific packages.
 
     Args:
         data: Parsed YAML dictionary
 
     Returns:
         Dictionary mapping package name to include path (as string representation)
+        Only includes common bus packages (i2c, spi, uart, etc.)
     """
     if "packages" not in data:
         return {}
 
+    # Get common bus package names (cached)
+    common_bus_packages = get_common_bus_packages()
+
     packages = {}
     for name, value in data["packages"].items():
-        # Store package info for comparison
-        packages[name] = str(value)
+        # Only include common bus packages, ignore component-specific ones
+        if name in common_bus_packages:
+            packages[name] = str(value)
 
     return packages
 
diff --git a/script/split_components_for_ci.py b/script/split_components_for_ci.py
index 865b82d42e..83faf58cbf 100755
--- a/script/split_components_for_ci.py
+++ b/script/split_components_for_ci.py
@@ -81,14 +81,16 @@ def create_intelligent_batches(
 
     sorted_groups = sorted(signature_groups.items(), key=sort_key)
 
+    # Flatten all components while preserving priority order
+    # This allows us to fill batches to batch_size by mixing signature groups
+    all_components_ordered = []
     for (platform, signature), group_components in sorted_groups:
-        # Split this signature group into batches of batch_size
-        # This keeps components with the same signature together
-        sorted_components = sorted(group_components)  # Sort for determinism
+        all_components_ordered.extend(sorted(group_components))
 
-        for i in range(0, len(sorted_components), batch_size):
-            batch = sorted_components[i : i + batch_size]
-            batches.append(batch)
+    # Create batches of exactly batch_size (except possibly the last one)
+    for i in range(0, len(all_components_ordered), batch_size):
+        batch = all_components_ordered[i : i + batch_size]
+        batches.append(batch)
 
     return batches