From fe29ce76bd87d5b42048228fbf0f47cc8d5411ec Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tour=C3=A9=20Holder?= Date: Tue, 3 Nov 2020 03:24:40 -0300 Subject: [PATCH] fix(is-ignored): ignore azure devops messages (#2230) The following Azure DevOps auto-generated merge commit message formats are being considered erros: - "Merge remote-tracking branch" (fails because is has no whitespace at the end) - "Merged PR 123: Description here" (fails because it does not contain "in" or "into") --- @commitlint/is-ignored/src/defaults.ts | 4 ++-- @commitlint/is-ignored/src/is-ignored.test.ts | 5 +++++ 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/@commitlint/is-ignored/src/defaults.ts b/@commitlint/is-ignored/src/defaults.ts index 79ef2c18fb..e8acc4448e 100644 --- a/@commitlint/is-ignored/src/defaults.ts +++ b/@commitlint/is-ignored/src/defaults.ts @@ -21,8 +21,8 @@ export const wildcards: Matcher[] = [ test(/^(R|r)evert (.*)/), test(/^(fixup|squash)!/), isSemver, - test(/^Merged (.*?)(in|into) (.*)/), - test(/^Merge remote-tracking branch (.*)/), + test(/^(Merged (.*?)(in|into) (.*)|Merged PR (.*): (.*))/), + test(/^Merge remote-tracking branch(\s*)(.*)/), test(/^Automatic merge(.*)/), test(/^Auto-merged (.*?) into (.*)/), ]; diff --git a/@commitlint/is-ignored/src/is-ignored.test.ts b/@commitlint/is-ignored/src/is-ignored.test.ts index b2fe87d00f..08911a615b 100644 --- a/@commitlint/is-ignored/src/is-ignored.test.ts +++ b/@commitlint/is-ignored/src/is-ignored.test.ts @@ -122,6 +122,11 @@ test('should return true for bitbucket merge commits', () => { test('should return true for automatic merge commits', () => { expect(isIgnored('Auto-merged develop into master')).toBe(true); + expect(isIgnored('Merge remote-tracking branch')).toBe(true); +}); + +test('should return true for azure devops merge commits', () => { + expect(isIgnored('Merged PR 123: Description here')).toBe(true); }); test('should return false for commits containing, but not starting, with merge branch', () => {