Skip to content

dist/tools: fix no-merge-keywords of pr_check (fix regression from #21803)#21859

Merged
crasbe merged 1 commit intoRIOT-OS:masterfrom
crasbe:pr/fix_no_merge_keywords
Nov 7, 2025
Merged

dist/tools: fix no-merge-keywords of pr_check (fix regression from #21803)#21859
crasbe merged 1 commit intoRIOT-OS:masterfrom
crasbe:pr/fix_no_merge_keywords

Conversation

@crasbe
Copy link
Copy Markdown
Contributor

@crasbe crasbe commented Nov 6, 2025

Contribution description

The no-merge-keyword expressions were prone to false positives, because in #21803 I removed the ^ of the regex, that tells it to only match from the line beginning.

Testing procedure

Current master matches to e update and therefore causes a false positive.

cbuec@W11nMate:~/RIOTstuff/riot-guides/RIOT$ echo "cpu/stm32: style update of rtc_all.c" | grep -i -f dist/tools/pr_check/no_merge_keywords
cpu/stm32: style update of rtc_all.c

This PR does not.

cbuec@W11nMate:~/RIOTstuff/riot-guides/RIOT$ echo "cpu/stm32: style update of rtc_all.c" | grep -i -f dist/tools/pr_check/no_merge_keywords

Issues/PRs references

Fixes regression introduced in #21803.

@crasbe crasbe requested a review from miri64 November 6, 2025 18:44
@crasbe crasbe added Type: bug The issue reports a bug / The PR fixes a bug (including spelling errors) Impact: minor The PR is small in size and might only require a quick look of a knowledgeable reviewer CI: ready for build If set, CI server will compile all applications for all available boards for the labeled PR CI: skip compile test If set, CI server will run only non-compile jobs, but no compile jobs or their dependent jobs labels Nov 6, 2025
@github-actions github-actions bot added the Area: tools Area: Supplementary tools label Nov 6, 2025
@crasbe crasbe force-pushed the pr/fix_no_merge_keywords branch from 8a7c144 to 259af6b Compare November 6, 2025 18:44
@crasbe crasbe enabled auto-merge November 6, 2025 18:59
@riot-ci
Copy link
Copy Markdown

riot-ci commented Nov 6, 2025

Murdock results

✔️ PASSED

259af6b dist/tools: fix no-merge-keywords of pr_check

Success Failures Total Runtime
1 0 1 01m:45s

Artifacts

@crasbe crasbe added this pull request to the merge queue Nov 6, 2025
Merged via the queue into RIOT-OS:master with commit 1e920d3 Nov 7, 2025
26 checks passed
@leandrolanzieri leandrolanzieri added this to the Release 2026.01 milestone Jan 13, 2026
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Area: tools Area: Supplementary tools CI: ready for build If set, CI server will compile all applications for all available boards for the labeled PR CI: skip compile test If set, CI server will run only non-compile jobs, but no compile jobs or their dependent jobs Impact: minor The PR is small in size and might only require a quick look of a knowledgeable reviewer Type: bug The issue reports a bug / The PR fixes a bug (including spelling errors)

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants