Merge branch 'ci/fixes'

Author: lucasssvaz

.github/scripts/generate_missing_junits.py

@@ -9,14 +9,6 @@
 import yaml
 
 
-def read_workflow_info(path: Path) -> dict:
-    try:
-        return json.loads(path.read_text(encoding="utf-8"))
-    except Exception as e:
-        print(f"WARN: Failed to read workflow info at {path}: {e}", file=sys.stderr)
-        return {}
-
-
 def parse_array(value) -> list[str]:
     if isinstance(value, list):
         return [str(x) for x in value]
@@ -197,28 +189,30 @@ def write_missing_xml(out_root: Path, platform: str, target: str, test_type: str
 
 
 def main():
-    # Args: <build_artifacts_dir> <output_junit_dir>
-    if len(sys.argv) != 3:
-        print(f"Usage: {sys.argv[0]} <build_artifacts_dir> <output_junit_dir>", file=sys.stderr)
+    # Args: <build_artifacts_dir> <test_results_dir> <output_junit_dir>
+    if len(sys.argv) != 4:
+        print(f"Usage: {sys.argv[0]} <build_artifacts_dir> <test_results_dir> <output_junit_dir>", file=sys.stderr)
         return 2
 
     build_root = Path(sys.argv[1]).resolve()
-    artifacts_root = Path(sys.argv[2]).resolve()
-    wf_info = artifacts_root / "parent-artifacts" / "workflow_info.json"
-
-    info = read_workflow_info(wf_info)
-    hw_enabled = str(info.get("hw_tests_enabled", "false")).lower() == "true"
-    wokwi_enabled = str(info.get("wokwi_tests_enabled", "false")).lower() == "true"
-    qemu_enabled = str(info.get("qemu_tests_enabled", "false")).lower() == "true"
-    hw_targets = parse_array(info.get("hw_targets"))
-    wokwi_targets = parse_array(info.get("wokwi_targets"))
-    qemu_targets = parse_array(info.get("qemu_targets"))
-    hw_types = parse_array(info.get("hw_types"))
-    wokwi_types = parse_array(info.get("wokwi_types"))
-    qemu_types = parse_array(info.get("qemu_types"))
+    results_root = Path(sys.argv[2]).resolve()
+    out_root = Path(sys.argv[3]).resolve()
+
+    # Read matrices from environment variables injected by workflow
+    hw_enabled = (os.environ.get("HW_TESTS_ENABLED", "false").lower() == "true")
+    wokwi_enabled = (os.environ.get("WOKWI_TESTS_ENABLED", "false").lower() == "true")
+    qemu_enabled = (os.environ.get("QEMU_TESTS_ENABLED", "false").lower() == "true")
+
+    hw_targets = parse_array(os.environ.get("HW_TARGETS", "[]"))
+    wokwi_targets = parse_array(os.environ.get("WOKWI_TARGETS", "[]"))
+    qemu_targets = parse_array(os.environ.get("QEMU_TARGETS", "[]"))
+
+    hw_types = parse_array(os.environ.get("HW_TYPES", "[]"))
+    wokwi_types = parse_array(os.environ.get("WOKWI_TYPES", "[]"))
+    qemu_types = parse_array(os.environ.get("QEMU_TYPES", "[]"))
 
     expected = expected_from_artifacts(build_root)  # (platform, target, type, sketch) -> expected_count
-    executed = scan_executed_xml(artifacts_root)    # (platform, target, type, sketch) -> count
+    executed = scan_executed_xml(results_root)      # (platform, target, type, sketch) -> count
 
     # Filter expected by enabled platforms and target/type matrices
     enabled_plats = set()
@@ -240,7 +234,7 @@ def main():
             continue
         got = executed.get((plat, target, test_type, sketch), 0)
         if got < exp_count:
-            write_missing_xml(artifacts_root, plat, target, test_type, sketch, exp_count - got)
+            write_missing_xml(out_root, plat, target, test_type, sketch, exp_count - got)
             missing_total += (exp_count - got)
 
     print(f"Generated {missing_total} placeholder JUnit files for missing runs.", file=sys.stderr)

.github/workflows/tests_results.yml

@@ -124,15 +124,24 @@ jobs:
           run_id: ${{ github.event.workflow_run.id }}
           path: ./artifacts
 
-      - name: Generate placeholders for missing runs
+      - name: Generate JUnit files for missing runs
         env:
           GH_TOKEN: ${{ github.token }}
+          HW_TESTS_ENABLED: ${{ needs.get-artifacts.outputs.hw_tests_enabled }}
+          HW_TARGETS: ${{ needs.get-artifacts.outputs.hw_targets }}
+          HW_TYPES: ${{ needs.get-artifacts.outputs.hw_types }}
+          WOKWI_TESTS_ENABLED: ${{ needs.get-artifacts.outputs.wokwi_tests_enabled }}
+          WOKWI_TARGETS: ${{ needs.get-artifacts.outputs.wokwi_targets }}
+          WOKWI_TYPES: ${{ needs.get-artifacts.outputs.wokwi_types }}
+          QEMU_TESTS_ENABLED: ${{ needs.get-artifacts.outputs.qemu_tests_enabled }}
+          QEMU_TARGETS: ${{ needs.get-artifacts.outputs.qemu_targets }}
+          QEMU_TYPES: ${{ needs.get-artifacts.outputs.qemu_types }}
         run: |
           pip3 install pyyaml
           mkdir -p build_artifacts test_errors
           gh run download ${{ needs.get-artifacts.outputs.original_run_id }} --name "test-bin-*" --dir ./build_artifacts || true
           wget https://raw.githubusercontent.com/${{ github.repository }}/master/.github/scripts/generate_missing_junits.py -O ./generate_missing_junits.py
-          python3 ./generate_missing_junits.py ./build_artifacts ./test_errors
+          python3 ./generate_missing_junits.py ./build_artifacts ./artifacts ./test_errors
 
       - name: Publish Unit Test Results
         uses: EnricoMi/publish-unit-test-result-action@170bf24d20d201b842d7a52403b73ed297e6645b # v2.18.0