From 5226f15c8462538a3820afbb8b25b1a06b32fa85 Mon Sep 17 00:00:00 2001 From: Byron Marohn Date: Wed, 26 Apr 2023 16:36:52 -0400 Subject: [PATCH] gha: Fix Body Line Length action flagging empty body commit messages Change the Body Line Length workflow to not trigger when the commit message contains only a message without a body. Other workflows will flag the missing body sections, and it was confusing to have an error message that said 'Body line too long (max 150)' when this was not actually the case. Fixes: #5561 Co-authored-by: Jayant Singh Co-authored-by: Luke Phillips Signed-off-by: Byron Marohn Signed-off-by: Jayant Singh Signed-off-by: Luke Phillips Signed-off-by: Kelby Madal-Hellmuth Signed-off-by: Liz Lawrens --- .github/workflows/commit-message-check.yaml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.github/workflows/commit-message-check.yaml b/.github/workflows/commit-message-check.yaml index fbdb02b6df..3cde335bdd 100644 --- a/.github/workflows/commit-message-check.yaml +++ b/.github/workflows/commit-message-check.yaml @@ -62,6 +62,9 @@ jobs: # to be specified at the start of the regex as the action is passed # the entire commit message. # + # - This check will pass if the commit message only contains a subject + # line, as other body message properties are enforced elsewhere. + # # - Body lines *can* be longer than the maximum if they start # with a non-alphabetic character or if there is no whitespace in # the line. @@ -75,7 +78,7 @@ jobs: # # - A SoB comment can be any length (as it is unreasonable to penalise # people with long names/email addresses :) - pattern: '^.+(\n([a-zA-Z].{0,150}|[^a-zA-Z\n].*|[^\s\n]*|Signed-off-by:.*|))+$' + pattern: '(^[^\n]+$|^.+(\n([a-zA-Z].{0,150}|[^a-zA-Z\n].*|[^\s\n]*|Signed-off-by:.*|))+$)' error: 'Body line too long (max 150)' post_error: ${{ env.error_msg }}