Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
6 changes: 5 additions & 1 deletion @commitlint/is-ignored/src/defaults.ts
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,11 @@ const isSemver = (c: string): boolean => {
return false;
}

const stripped = firstLine.replace(/^chore(\([^)]+\))?:/, "").trim();
const stripped = firstLine
.replace(/^chore(\([^)]+\))?:/, "")
.replace(/\[(skip|ci)(-|\s)(ci|skip)\]/i, "")
.replace(/\((skip|ci)(-|\s)(ci|skip)\)/i, "")
.trim();
return semver.valid(stripped) !== null;
};

Expand Down
18 changes: 18 additions & 0 deletions @commitlint/is-ignored/src/is-ignored.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -124,6 +124,24 @@ test("should ignore npm semver commits with footers", () => {
);
});

test("should ignore npm semver commits with CI skip markers", () => {
expect(isIgnored("2.3.3-beta.1 [skip ci]")).toBe(true);
expect(isIgnored("2.3.3-beta.1 [ci skip]")).toBe(true);
expect(isIgnored("2.3.3-beta.1 [skip-ci]")).toBe(true);
expect(isIgnored("2.3.3-beta.1 [ci-skip]")).toBe(true);
expect(isIgnored("2.3.3-beta.1 (skip ci)")).toBe(true);
expect(isIgnored("2.3.3-beta.1 (ci skip)")).toBe(true);
expect(isIgnored("2.3.3-beta.1 (skip-ci)")).toBe(true);
expect(isIgnored("2.3.3-beta.1 (ci-skip)")).toBe(true);
});

test("should ignore npm semver commits with chore and CI skip markers", () => {
expect(isIgnored("chore(release): 2.3.3-beta.1 [skip ci]")).toBe(true);
expect(isIgnored("chore(release): 2.3.3-beta.1 [ci skip]")).toBe(true);
expect(isIgnored("chore: 2.3.3-beta.1 [skip ci]")).toBe(true);
expect(isIgnored("chore: 2.3.3-beta.1 [ci skip]")).toBe(true);
});

test("should return true amend commits", () => {
expect(isIgnored("amend! initial commit")).toBe(true);
});
Expand Down
Loading