Skip to content

Commit cd9afbb

Browse files
committed
change(ci): Overhaul CI test flow management
1 parent b20655a commit cd9afbb

File tree

507 files changed

+2006
-1924
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

507 files changed

+2006
-1924
lines changed

.github/CODEOWNERS

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -72,9 +72,9 @@
7272
/libraries/Wire/ @me-no-dev
7373
/libraries/Zigbee/ @P-R-O-C-H-Y
7474

75-
# CI JSON
75+
# CI YAML
7676
# Keep this after other libraries and tests to avoid being overridden.
77-
**/ci.json @lucasssvaz
77+
**/ci.yml @lucasssvaz
7878

7979
# The CODEOWNERS file should be owned by the developers of the ESP32 Arduino Core.
8080
# Leave this entry as the last one to avoid being overridden.
Lines changed: 246 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,246 @@
1+
#!/usr/bin/env python3
2+
3+
import json
4+
import os
5+
import re
6+
import sys
7+
from pathlib import Path
8+
from xml.etree.ElementTree import Element, SubElement, ElementTree
9+
import yaml
10+
11+
12+
def parse_array(value) -> list[str]:
13+
if isinstance(value, list):
14+
return [str(x) for x in value]
15+
if not isinstance(value, str):
16+
return []
17+
txt = value.strip()
18+
if not txt:
19+
return []
20+
# Try JSON
21+
try:
22+
return [str(x) for x in json.loads(txt)]
23+
except Exception:
24+
pass
25+
# Normalize single quotes then JSON
26+
try:
27+
fixed = txt.replace("'", '"')
28+
return [str(x) for x in json.loads(fixed)]
29+
except Exception:
30+
pass
31+
# Fallback: CSV
32+
return [p.strip() for p in txt.strip("[]").split(",") if p.strip()]
33+
34+
35+
def _parse_ci_yml(content: str) -> dict:
36+
if not content:
37+
return {}
38+
try:
39+
data = yaml.safe_load(content) or {}
40+
if not isinstance(data, dict):
41+
return {}
42+
return data
43+
except Exception:
44+
return {}
45+
46+
47+
def _fqbn_counts_from_yaml(ci: dict) -> dict[str, int]:
48+
counts: dict[str, int] = {}
49+
if not isinstance(ci, dict):
50+
return counts
51+
fqbn = ci.get("fqbn")
52+
if not isinstance(fqbn, dict):
53+
return counts
54+
for target, entries in fqbn.items():
55+
if isinstance(entries, list):
56+
counts[str(target)] = len(entries)
57+
elif entries is not None:
58+
# Single value provided as string
59+
counts[str(target)] = 1
60+
return counts
61+
62+
63+
def _sdkconfig_meets(ci_cfg: dict, sdk_text: str) -> bool:
64+
if not sdk_text:
65+
return True
66+
for req in ci_cfg.get("requires", []):
67+
if not req or not isinstance(req, str):
68+
continue
69+
if not any(line.startswith(req) for line in sdk_text.splitlines()):
70+
return False
71+
req_any = ci_cfg.get("requires_any", [])
72+
if req_any:
73+
if not any(any(line.startswith(r.strip()) for line in sdk_text.splitlines()) for r in req_any if isinstance(r, str)):
74+
return False
75+
return True
76+
77+
78+
def expected_from_artifacts(build_root: Path) -> dict[tuple[str, str, str, str], int]:
79+
"""Compute expected runs using ci.yml and sdkconfig found in build artifacts.
80+
Returns mapping (platform, target, type, sketch) -> expected_count
81+
"""
82+
expected: dict[tuple[str, str, str, str], int] = {}
83+
if not build_root.exists():
84+
return expected
85+
for artifact_dir in build_root.iterdir():
86+
if not artifact_dir.is_dir():
87+
continue
88+
m = re.match(r"test-bin-([A-Za-z0-9_\-]+)-([A-Za-z0-9_\-]+)", artifact_dir.name)
89+
if not m:
90+
continue
91+
target = m.group(1)
92+
test_type = m.group(2)
93+
# Walk build*.tmp directories which contain ci.yml and sdkconfig
94+
for p in artifact_dir.rglob("*.tmp"):
95+
if not p.is_dir() or not re.search(r"build\d*\.tmp$", str(p)):
96+
continue
97+
# Infer sketch name from path
98+
parts = p.parts
99+
try:
100+
idx = parts.index(".arduino")
101+
except ValueError:
102+
continue
103+
if idx + 4 >= len(parts) or parts[idx + 1] != "tests":
104+
continue
105+
sketch_target = parts[idx + 2]
106+
sketch = parts[idx + 3]
107+
if sketch_target != target:
108+
continue
109+
ci_path = p / "ci.yml"
110+
sdk_path = p / "sdkconfig"
111+
try:
112+
ci_text = ci_path.read_text(encoding="utf-8") if ci_path.exists() else ""
113+
except Exception:
114+
ci_text = ""
115+
try:
116+
sdk_text = sdk_path.read_text(encoding="utf-8", errors="ignore") if sdk_path.exists() else ""
117+
except Exception:
118+
sdk_text = ""
119+
ci = _parse_ci_yml(ci_text)
120+
fqbn_counts = _fqbn_counts_from_yaml(ci)
121+
# Determine allowed platforms for this test
122+
allowed_platforms = []
123+
platforms_cfg = ci.get("platforms") if isinstance(ci, dict) else None
124+
for plat in ("hardware", "wokwi", "qemu"):
125+
dis = None
126+
if isinstance(platforms_cfg, dict):
127+
dis = platforms_cfg.get(plat)
128+
if dis is False:
129+
continue
130+
allowed_platforms.append(plat)
131+
# Requirements check
132+
minimal = {
133+
"requires": ci.get("requires") or [],
134+
"requires_any": ci.get("requires_any") or [],
135+
}
136+
if not _sdkconfig_meets(minimal, sdk_text):
137+
continue
138+
# Expected runs per target driven by fqbn count; default 1 when 0
139+
exp_runs = fqbn_counts.get(target, 0) or 1
140+
for plat in allowed_platforms:
141+
expected[(plat, target, test_type, sketch)] = max(expected.get((plat, target, test_type, sketch), 0), exp_runs)
142+
return expected
143+
144+
145+
def scan_executed_xml(xml_root: Path) -> dict[tuple[str, str, str, str], int]:
146+
"""Return executed counts per (platform, target, type, sketch)."""
147+
counts: dict[tuple[str, str, str, str], int] = {}
148+
if not xml_root.exists():
149+
return counts
150+
for xml_path in xml_root.rglob("*.xml"):
151+
if not xml_path.is_file():
152+
continue
153+
rel = str(xml_path)
154+
platform = "hardware"
155+
if "test-results-wokwi-" in rel:
156+
platform = "wokwi"
157+
elif "test-results-qemu-" in rel:
158+
platform = "qemu"
159+
# Expect tests/<type>/<sketch>/<target>/<sketch>.xml
160+
# Find 'tests' segment
161+
parts = xml_path.parts
162+
try:
163+
t_idx = parts.index("tests")
164+
except ValueError:
165+
continue
166+
if t_idx + 4 >= len(parts):
167+
continue
168+
test_type = parts[t_idx + 1]
169+
sketch = parts[t_idx + 2]
170+
target = parts[t_idx + 3]
171+
key = (platform, target, test_type, sketch)
172+
counts[key] = counts.get(key, 0) + 1
173+
return counts
174+
175+
176+
def write_missing_xml(out_root: Path, platform: str, target: str, test_type: str, sketch: str, missing_count: int):
177+
out_tests_dir = out_root / f"test-results-{platform}" / "tests" / test_type / sketch / target
178+
out_tests_dir.mkdir(parents=True, exist_ok=True)
179+
# Create one XML per missing index
180+
for idx in range(missing_count):
181+
suite_name = f"{test_type}_{platform}_{target}_{sketch}"
182+
root = Element("testsuite", name=suite_name, tests="1", failures="1", errors="0")
183+
case = SubElement(root, "testcase", classname=f"{test_type}.{sketch}", name="missing-run")
184+
fail = SubElement(case, "failure", message="Expected test run missing")
185+
fail.text = "This placeholder indicates an expected test run did not execute."
186+
tree = ElementTree(root)
187+
out_file = out_tests_dir / f"{sketch}_missing_{idx}.xml"
188+
tree.write(out_file, encoding="utf-8", xml_declaration=True)
189+
190+
191+
def main():
192+
# Args: <build_artifacts_dir> <test_results_dir> <output_junit_dir>
193+
if len(sys.argv) != 4:
194+
print(f"Usage: {sys.argv[0]} <build_artifacts_dir> <test_results_dir> <output_junit_dir>", file=sys.stderr)
195+
return 2
196+
197+
build_root = Path(sys.argv[1]).resolve()
198+
results_root = Path(sys.argv[2]).resolve()
199+
out_root = Path(sys.argv[3]).resolve()
200+
201+
# Read matrices from environment variables injected by workflow
202+
hw_enabled = (os.environ.get("HW_TESTS_ENABLED", "false").lower() == "true")
203+
wokwi_enabled = (os.environ.get("WOKWI_TESTS_ENABLED", "false").lower() == "true")
204+
qemu_enabled = (os.environ.get("QEMU_TESTS_ENABLED", "false").lower() == "true")
205+
206+
hw_targets = parse_array(os.environ.get("HW_TARGETS", "[]"))
207+
wokwi_targets = parse_array(os.environ.get("WOKWI_TARGETS", "[]"))
208+
qemu_targets = parse_array(os.environ.get("QEMU_TARGETS", "[]"))
209+
210+
hw_types = parse_array(os.environ.get("HW_TYPES", "[]"))
211+
wokwi_types = parse_array(os.environ.get("WOKWI_TYPES", "[]"))
212+
qemu_types = parse_array(os.environ.get("QEMU_TYPES", "[]"))
213+
214+
expected = expected_from_artifacts(build_root) # (platform, target, type, sketch) -> expected_count
215+
executed = scan_executed_xml(results_root) # (platform, target, type, sketch) -> count
216+
217+
# Filter expected by enabled platforms and target/type matrices
218+
enabled_plats = set()
219+
if hw_enabled:
220+
enabled_plats.add("hardware")
221+
if wokwi_enabled:
222+
enabled_plats.add("wokwi")
223+
if qemu_enabled:
224+
enabled_plats.add("qemu")
225+
226+
target_set = set(hw_targets + wokwi_targets + qemu_targets)
227+
type_set = set(hw_types + wokwi_types + qemu_types)
228+
229+
missing_total = 0
230+
for (plat, target, test_type, sketch), exp_count in expected.items():
231+
if plat not in enabled_plats:
232+
continue
233+
if target not in target_set or test_type not in type_set:
234+
continue
235+
got = executed.get((plat, target, test_type, sketch), 0)
236+
if got < exp_count:
237+
write_missing_xml(out_root, plat, target, test_type, sketch, exp_count - got)
238+
missing_total += (exp_count - got)
239+
240+
print(f"Generated {missing_total} placeholder JUnit files for missing runs.", file=sys.stderr)
241+
242+
243+
if __name__ == "__main__":
244+
sys.exit(main())
245+
246+

.github/scripts/get_affected.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@
6363
Build file patterns
6464
--------------------
6565
- **build_files**: Core Arduino build system files (platform.txt, variants/**, etc.)
66-
- **sketch_build_files**: Sketch-specific files (ci.json, *.csv in example directories)
66+
- **sketch_build_files**: Sketch-specific files (ci.yml, *.csv in example directories)
6767
- **idf_build_files**: Core IDF build system files (CMakeLists.txt, idf_component.yml, etc.)
6868
- **idf_project_files**: Project-specific IDF files (per-example CMakeLists.txt, sdkconfig, etc.)
6969
@@ -128,7 +128,7 @@
128128
# Files that are used by the sketch build system.
129129
# If any of these files change, the sketch should be recompiled.
130130
sketch_build_files = [
131-
"libraries/*/examples/**/ci.json",
131+
"libraries/*/examples/**/ci.yml",
132132
"libraries/*/examples/**/*.csv",
133133
]
134134

@@ -150,7 +150,7 @@
150150
# If any of these files change, the example that uses them should be recompiled.
151151
idf_project_files = [
152152
"idf_component_examples/*/CMakeLists.txt",
153-
"idf_component_examples/*/ci.json",
153+
"idf_component_examples/*/ci.yml",
154154
"idf_component_examples/*/*.csv",
155155
"idf_component_examples/*/sdkconfig*",
156156
"idf_component_examples/*/main/*",

.github/scripts/on-push-idf.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,9 @@ fi
1717

1818
for example in $affected_examples; do
1919
example_path="$PWD/components/arduino-esp32/$example"
20-
if [ -f "$example_path/ci.json" ]; then
20+
if [ -f "$example_path/ci.yml" ]; then
2121
# If the target is listed as false, skip the sketch. Otherwise, include it.
22-
is_target=$(jq -r --arg target "$IDF_TARGET" '.targets[$target]' "$example_path/ci.json")
22+
is_target=$(yq eval ".targets.${IDF_TARGET}" "$example_path/ci.yml" 2>/dev/null)
2323
if [[ "$is_target" == "false" ]]; then
2424
printf "\n\033[93mSkipping %s for target %s\033[0m\n\n" "$example" "$IDF_TARGET"
2525
continue

0 commit comments

Comments
 (0)