diff --git a/.github/workflows/pr-checker.yml b/.github/workflows/pr-checker.yml index a8a4ec2e1f..2896563a78 100644 --- a/.github/workflows/pr-checker.yml +++ b/.github/workflows/pr-checker.yml @@ -22,11 +22,11 @@ jobs: }); const regex = /^((build|chore|ci|docs?|feat|fix|perf|refactor|rft|style|test|i18n)[\:\.\(\,]|[Rr]evert|[Rr]elease)/; - const invalidCommits = commits.filter(commit => !regex.test(commit.commit.message)); + const invalidCommits = commits.filter(commit => !regex.test(commit.commit.message) || commit.parents.length > 1); console.log(`check ${commits.length} commit(s)`); if (invalidCommits.length > 0) { const invalidCommitNames = invalidCommits.map(commit => commit.commit.message); - core.setFailed(`Invalid commit names found: ${invalidCommitNames.join(", ")}`); + core.setFailed(`Invalid commit found: ${invalidCommitNames.join(", ")}`); }