Skip to content

ci: exclude vendored STM32Cube driver trees from the merge-marker check - #61

Merged
BotshareAI merged 2 commits into
mainfrom
ci/exclude-vendored-st-drivers
Oct 24, 2026
Merged

BotshareAI merged 2 commits into
mainfrom
ci/exclude-vendored-st-drivers

Conversation

@BotshareAI

@BotshareAI BotshareAI commented Oct 24, 2026 •

Copy link
Copy Markdown
Contributor

Summary

The "Reject unresolved merge markers" step flags the "=====" documentation rules in STMicroelectronics HAL sources. openamr-platform-fw #22 edited three ST files to pass it, which breaks byte-identity with the STM32Cube package. This change excludes only the exact vendored STM32Cube driver trees: **/Drivers/STM32H7xx_HAL_Driver/**, **/Drivers/CMSIS/** and **/Drivers/BSP/STM32H7xx_Nucleo/**. Detection in all project code is unchanged.

Integration Gate

Needed before openamr-platform-fw #22 reverts its HAL edits (commit e49f0bb). No overlapping open PR touches this step.

Tests

  • Base SHA: 1c3f516 Head SHA: 78ee2b2
  • Regression tests in tests.test_reusable_workflow.MergeMarkers. Each case runs the step command read from the workflow file in a temporary git repository:
    • test_exact_stm32cube_vendor_trees_are_not_reported: boards/stm32/X/Drivers/STM32H7xx_HAL_Driver/Src/hal.c, boards/stm32/X/Drivers/CMSIS/Include/c.h and boards/stm32/X/Drivers/BSP/STM32H7xx_Nucleo/b.c, each with a ======= line, are not reported and the step succeeds.
    • test_project_code_is_reported_even_under_a_drivers_directory: src/Drivers/BSP/project.c, src/Drivers/STM32Custom/project.c and src/real.c, each with a ======= line, are reported and the step fails.
    • test_repository_without_markers_passes: a repository with none of these markers passes.
    • test_vendored_stm32cube_drivers_are_excluded_but_project_code_is_not (from the first commit): HAL and CMSIS files are hidden in a mixed repository, and src/real.c is reported.
  • Before, with the exclusions of 736604a (Drivers/STM32*, Drivers/CMSIS, Drivers/BSP): FAILED (failures=2). src/Drivers/BSP/project.c and src/Drivers/STM32Custom/project.c were hidden; the step exited 0 instead of 1. The other cases passed.
  • After 78ee2b2: Ran 4 tests, OK.
  • First commit 736604a, against the unmodified workflow: the original test failed (both ST files were reported) and passed after the change.
  • Full suite: python3 -m unittest discover -s tests -v, Ran 275 tests, OK (0 failures, 0 errors, 0 skipped).
  • check_workflow_policy.py --root . : result: 0 workflow policy findings (exit 0).

Safety impact

Runtime safety impact: none. This changes the scope of the repository-quality merge-marker check only.

Not verified

  • A hosted run in openamr-platform-fw after merge (its caller uses @main and picks this up on the next run).
  • Byte-identity of the excluded vendor files with the declared STM32Cube package. A provenance check in openamr-platform-fw covers this separately.

AI disclosure

Claude Code made the workflow edit, wrote the regression test and this description.


Generated by Claude Code

BotshareAI and others added 2 commits October 24, 2026 11:34
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01TPiK6pUmmjNhPceECkKpR2
Signed-off-by: Alex Reznichenko <info@botshare.ai>
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01TPiK6pUmmjNhPceECkKpR2
Signed-off-by: Alex Reznichenko <info@botshare.ai>
@BotshareAI
BotshareAI marked this pull request as ready for review October 24, 2026 12:37
@BotshareAI
BotshareAI merged commit 68833f2 into main Oct 24, 2026
6 checks passed
@BotshareAI
BotshareAI deleted the ci/exclude-vendored-st-drivers branch October 24, 2026 12:37
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant