Skip to content

Commit ccffcd7

Browse files
authored
ci: conventional commits aws#5494
Problem ------- PRs created by the automerge bot are rejected. Also when merging feature branches to master. Solution -------- Allow "Merge" pull requests.
1 parent ce99859 commit ccffcd7

File tree

2 files changed

+6
-1
lines changed

2 files changed

+6
-1
lines changed

.github/workflows/lintcommit.js

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -71,6 +71,10 @@ function validateTitle(title) {
7171
const parts = title.split(':')
7272
const subject = parts.slice(1).join(':').trim()
7373

74+
if (title.startsWith('Merge')) {
75+
return undefined
76+
}
77+
7478
if (parts.length < 2) {
7579
return 'missing colon (:) char'
7680
}
@@ -172,6 +176,7 @@ function _test() {
172176
'style: format code': undefined,
173177
'test: add new tests': undefined,
174178
'types: add type definitions': undefined,
179+
'Merge staging into feature/lambda-get-started': undefined,
175180
}
176181

177182
let passed = 0

.github/workflows/node.js.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ jobs:
3232
- uses: actions/setup-node@v4
3333
with:
3434
node-version: '20'
35-
- name: Check PR title and commit message
35+
- name: Check PR title
3636
run: |
3737
node "$GITHUB_WORKSPACE/.github/workflows/lintcommit.js"
3838

0 commit comments

Comments
 (0)