Repository navigation
ci: exclude vendored STM32Cube driver trees from the merge-marker check - #61
Merged
Merged
Conversation
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
marked this pull request as ready for review
October 24, 2026 12:37
BotshareAI
requested review from
panthera-momagdii and
wikki26
as code owners
October 24, 2026 12:37
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
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
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.handboards/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.candsrc/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, andsrc/real.cis reported.Drivers/STM32*,Drivers/CMSIS,Drivers/BSP): FAILED (failures=2).src/Drivers/BSP/project.candsrc/Drivers/STM32Custom/project.cwere hidden; the step exited 0 instead of 1. The other cases passed.python3 -m unittest discover -s tests -v, Ran 275 tests, OK (0 failures, 0 errors, 0 skipped).Safety impact
Runtime safety impact: none. This changes the scope of the repository-quality merge-marker check only.
Not verified
AI disclosure
Claude Code made the workflow edit, wrote the regression test and this description.
Generated by Claude Code