Skip to content

Commit 3474692

Browse files
authored
Merge pull request #147 from RustyRory/feat/138-dashboard-membres-clean
fix(ci): trim whitespace and ignore all merge commits in commit check
2 parents a6f2624 + 0be3593 commit 3474692

1 file changed

Lines changed: 10 additions & 7 deletions

File tree

.github/workflows/commit-message.yml

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -23,26 +23,29 @@ jobs:
2323
2424
git fetch origin $BASE_REF
2525
26-
REGEX="^(feat|fix|docs|chore|refactor|test|hotfix)\([a-z0-9_-]+\): Fixes #[0-9]+ - .+"
26+
# Commits avec numéro d'issue (feat, fix, hotfix, refactor, test)
27+
REGEX_ISSUE="^(feat|fix|hotfix|refactor|test)\([a-z0-9_-]+\): Fixes #[0-9]+ - .+"
28+
# Commits sans numéro d'issue autorisés (chore, docs, ci, fix(ci))
29+
REGEX_NO_ISSUE="^(chore|docs|ci|fix)\(ci\): .+|^(chore|docs)\([a-z0-9_-]+\): .+"
2730
2831
COMMITS=$(git log origin/$BASE_REF..HEAD --pretty=format:"%H")
2932
3033
INVALID=false
3134
3235
for COMMIT in $COMMITS; do
33-
MESSAGE=$(git log -1 --pretty=format:"%s" $COMMIT)
36+
MESSAGE=$(git log -1 --pretty=format:"%s" $COMMIT | sed 's/^[[:space:]]*//')
3437
35-
# Ignorer les commits de merge
36-
if [[ "$MESSAGE" =~ ^Merge\ ]]; then
38+
# Ignorer tous les commits de merge
39+
if [[ "$MESSAGE" =~ ^Merge ]]; then
3740
echo "⏭️ Commit de merge ignoré: $MESSAGE"
3841
continue
3942
fi
4043
41-
if ! [[ "$MESSAGE" =~ $REGEX ]]; then
44+
if [[ "$MESSAGE" =~ $REGEX_ISSUE ]] || [[ "$MESSAGE" =~ $REGEX_NO_ISSUE ]]; then
45+
echo "✅ Commit valide: $MESSAGE"
46+
else
4247
echo "❌ Commit invalide: $MESSAGE"
4348
INVALID=true
44-
else
45-
echo "✅ Commit valide: $MESSAGE"
4649
fi
4750
done
4851

0 commit comments

Comments
 (0)