Skip to content

Commit 5ad9228

Browse files
Agent Communication MCP Serverclaude
andcommitted
ci: add 'merge' as valid commit type in PR validation
- Updated PR validation workflow to accept 'merge:' commit type - Added 'merge' to allowed types in both title and commit validation - Updated CONTRIBUTING.md to document merge commit type - Enables proper validation of branch synchronization commits This allows merge commits like 'merge: sync branch with latest changes' to pass validation without errors. 🤖 Generated with [Claude Code](https://claude.ai/code) Co-Authored-By: Claude <noreply@anthropic.com>
1 parent 689a856 commit 5ad9228

2 files changed

Lines changed: 9 additions & 7 deletions

File tree

.github/workflows/pr-validation.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -35,14 +35,14 @@ jobs:
3535
# Check conventional commit format (skip emoji stripping for now)
3636
CLEANED_TITLE="$PR_TITLE"
3737
38-
if echo "$CLEANED_TITLE" | grep -qE '^(feat|fix|docs|style|refactor|perf|test|chore|ci|build|resolve)(\([^)]+\))?(!)?: .+'; then
38+
if echo "$CLEANED_TITLE" | grep -qE '^(feat|fix|docs|style|refactor|perf|test|chore|ci|build|resolve|merge)(\([^)]+\))?(!)?: .+'; then
3939
echo "✅ PR title follows conventional commit format"
4040
echo "valid_title=true" >> $GITHUB_OUTPUT
41-
41+
4242
# Extract type for labeling from cleaned title
4343
TYPE=$(echo "$CLEANED_TITLE" | sed -E 's/^([a-z]+)(\([^)]+\))?(!)?: .*/\1/')
4444
echo "pr_type=$TYPE" >> $GITHUB_OUTPUT
45-
45+
4646
# Check for breaking change indicator
4747
if echo "$PR_TITLE" | grep -q '!:'; then
4848
echo "breaking_change=true" >> $GITHUB_OUTPUT
@@ -52,7 +52,7 @@ jobs:
5252
else
5353
echo "❌ PR title does not follow conventional commit format"
5454
echo "Expected format: type(scope): description"
55-
echo "Valid types: feat, fix, docs, style, refactor, perf, test, chore, ci, build, resolve"
55+
echo "Valid types: feat, fix, docs, style, refactor, perf, test, chore, ci, build, resolve, merge"
5656
echo "valid_title=false" >> $GITHUB_OUTPUT
5757
fi
5858
@@ -76,7 +76,7 @@ jobs:
7676
if echo "$commit_msg" | grep -qE '^Merge (branch|pull request)'; then
7777
echo " ⏭️ Skipping merge commit"
7878
VALID_COUNT=$((VALID_COUNT + 1))
79-
elif echo "$commit_msg" | grep -qE '^(feat|fix|docs|style|refactor|perf|test|chore|ci|build|resolve)(\([^)]+\))?(!)?: .+'; then
79+
elif echo "$commit_msg" | grep -qE '^(feat|fix|docs|style|refactor|perf|test|chore|ci|build|resolve|merge)(\([^)]+\))?(!)?: .+'; then
8080
VALID_COUNT=$((VALID_COUNT + 1))
8181
echo " ✅ Valid"
8282
else
@@ -147,7 +147,7 @@ jobs:
147147
148148
**Expected format:** `type(scope): description`
149149
150-
**Valid types:** feat, fix, docs, style, refactor, perf, test, chore, ci, build, resolve
150+
**Valid types:** feat, fix, docs, style, refactor, perf, test, chore, ci, build, resolve, merge
151151
152152
**Examples:**
153153
- `feat: add new MCP tool for task delegation`

CONTRIBUTING.md

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ type(scope): description
5252

5353
#### Commit Types
5454
- **feat**: New features (triggers minor version bump)
55-
- **fix**: Bug fixes (triggers patch version bump)
55+
- **fix**: Bug fixes (triggers patch version bump)
5656
- **docs**: Documentation changes only
5757
- **style**: Code style changes (formatting, no logic changes)
5858
- **refactor**: Code restructuring without functionality changes
@@ -61,6 +61,7 @@ type(scope): description
6161
- **chore**: Maintenance tasks, tooling, dependencies
6262
- **ci**: CI/CD configuration changes
6363
- **build**: Build system changes
64+
- **merge**: Merge commits from branch synchronization
6465

6566
#### Breaking Changes
6667
For breaking changes, add `!` after type or include `BREAKING CHANGE:` in footer:
@@ -141,6 +142,7 @@ We follow [Conventional Commits](https://conventionalcommits.org/) with semantic
141142
- `chore`: Maintenance tasks (deps, build, etc.)
142143
- `perf`: Performance improvements
143144
- `ci`: CI/CD pipeline changes
145+
- `merge`: Branch merge commits
144146

145147
### Examples
146148
```bash

0 commit comments

Comments
 (0)