Skip to content

fix(ci): trim whitespace and ignore all merge commits in commit check #147

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
RustyRory merged 3 commits into from
Apr 5, 2026
Merged

fix(ci): trim whitespace and ignore all merge commits in commit check #147

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c7e9608
fix(ci): trim whitespace and ignore all merge commits in commit check
RustyRory Apr 5, 2026
f2fbccb
chore(ci): fix commit message check regex
RustyRory Apr 5, 2026
0be3593
chore(ci): allow fix(ci) commits without issue number
RustyRory Apr 5, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 10 additions & 7 deletions .github/workflows/commit-message.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,26 +23,29 @@ jobs:

git fetch origin $BASE_REF

REGEX="^(feat|fix|docs|chore|refactor|test|hotfix)\([a-z0-9_-]+\): Fixes #[0-9]+ - .+"
# Commits avec numéro d'issue (feat, fix, hotfix, refactor, test)
REGEX_ISSUE="^(feat|fix|hotfix|refactor|test)\([a-z0-9_-]+\): Fixes #[0-9]+ - .+"
# Commits sans numéro d'issue autorisés (chore, docs, ci, fix(ci))
REGEX_NO_ISSUE="^(chore|docs|ci|fix)\(ci\): .+|^(chore|docs)\([a-z0-9_-]+\): .+"

COMMITS=$(git log origin/$BASE_REF..HEAD --pretty=format:"%H")

INVALID=false

for COMMIT in $COMMITS; do
MESSAGE=$(git log -1 --pretty=format:"%s" $COMMIT)
MESSAGE=$(git log -1 --pretty=format:"%s" $COMMIT | sed 's/^[[:space:]]*//')

# Ignorer les commits de merge
if [[ "$MESSAGE" =~ ^Merge\ ]]; then
# Ignorer tous les commits de merge
if [[ "$MESSAGE" =~ ^Merge ]]; then
echo "⏭️ Commit de merge ignoré: $MESSAGE"
continue
fi

if ! [[ "$MESSAGE" =~ $REGEX ]]; then
if [[ "$MESSAGE" =~ $REGEX_ISSUE ]] || [[ "$MESSAGE" =~ $REGEX_NO_ISSUE ]]; then
echo "✅ Commit valide: $MESSAGE"
else
echo "❌ Commit invalide: $MESSAGE"
INVALID=true
else
echo "✅ Commit valide: $MESSAGE"
fi
done

Expand Down
Loading