From 69545eb9e3605f70399b27e875121f14c5e894d2 Mon Sep 17 00:00:00 2001 From: Efra Espada Date: Mon, 2 Dec 2024 21:53:18 +0100 Subject: [PATCH 1/6] feature-26-exclude-merge-branch-commits-of-prefix-check: excluding merge branch commit messages --- src/data/usecase/commit_check_use_case.ts | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/data/usecase/commit_check_use_case.ts b/src/data/usecase/commit_check_use_case.ts index af6975a1b..dc74baf5a 100644 --- a/src/data/usecase/commit_check_use_case.ts +++ b/src/data/usecase/commit_check_use_case.ts @@ -8,7 +8,7 @@ import {ExecuteScriptUseCase} from "./steps/execute_script_use_case"; export class CommitCheckUseCase implements ParamUseCase { taskId: string = 'CommitCheckUseCase'; private issueRepository = new IssueRepository(); - + private mergeBranchPattern = 'Merge branch ' private separator = '------------------------------------------------------' async invoke(param: Execution): Promise { @@ -56,7 +56,10 @@ ${commit.message} \`\`\` `; - if (commit.message.indexOf(commitPrefix) !== 0 && commitPrefix.length > 0) { + if ( + (commit.message.indexOf(commitPrefix) !== 0 && commitPrefix.length > 0) + && commit.message.indexOf(this.mergeBranchPattern) !== 0 + ) { shouldWarn = true; } } From 7854f3c2d16ac677bba078b09a0e97bba952ba5c Mon Sep 17 00:00:00 2001 From: Efra Espada Date: Mon, 2 Dec 2024 21:54:00 +0100 Subject: [PATCH 2/6] gh-action: updated compiled files --- dist/index.js | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/dist/index.js b/dist/index.js index 20b02b4a1..d0ef79799 100644 --- a/dist/index.js +++ b/dist/index.js @@ -31594,6 +31594,7 @@ class CommitCheckUseCase { constructor() { this.taskId = 'CommitCheckUseCase'; this.issueRepository = new issue_repository_1.IssueRepository(); + this.mergeBranchPattern = 'Merge branch '; this.separator = '------------------------------------------------------'; } async invoke(param) { @@ -31635,7 +31636,8 @@ ${commit.message} \`\`\` `; - if (commit.message.indexOf(commitPrefix) !== 0 && commitPrefix.length > 0) { + if ((commit.message.indexOf(commitPrefix) !== 0 && commitPrefix.length > 0) + && commit.message.indexOf(this.mergeBranchPattern) !== 0) { shouldWarn = true; } } From 82b31f7c8038d323677e62889c4b55b697eb5d74 Mon Sep 17 00:00:00 2001 From: Efra Espada Date: Mon, 2 Dec 2024 21:55:10 +0100 Subject: [PATCH 3/6] feature-26-exclude-merge-branch-commits-of-prefix-check: removing prefix from displayed commit message --- src/data/usecase/commit_check_use_case.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/data/usecase/commit_check_use_case.ts b/src/data/usecase/commit_check_use_case.ts index dc74baf5a..ff6939ce9 100644 --- a/src/data/usecase/commit_check_use_case.ts +++ b/src/data/usecase/commit_check_use_case.ts @@ -52,7 +52,7 @@ ${this.separator} - ${commit.id} by **${commit.author.name}** (@${commit.author.username}) \`\`\` -${commit.message} +${commit.message.replaceAll(`${commitPrefix}: `, '')} \`\`\` `; From 72f36b4d734ef64279e9f270a37e9a656b43e2d4 Mon Sep 17 00:00:00 2001 From: Efra Espada Date: Mon, 2 Dec 2024 21:55:54 +0100 Subject: [PATCH 4/6] gh-action: updated compiled files --- dist/index.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dist/index.js b/dist/index.js index d0ef79799..b548854a9 100644 --- a/dist/index.js +++ b/dist/index.js @@ -31632,7 +31632,7 @@ ${this.separator} - ${commit.id} by **${commit.author.name}** (@${commit.author.username}) \`\`\` -${commit.message} +${commit.message.replaceAll(`${commitPrefix}: `, '')} \`\`\` `; From 47ea8e0448e90c738be63d688b7b3d3dc0169f15 Mon Sep 17 00:00:00 2001 From: Efra Espada Date: Mon, 2 Dec 2024 21:56:53 +0100 Subject: [PATCH 5/6] feature-26-exclude-merge-branch-commits-of-prefix-check: ignoring gh-action message --- src/data/usecase/commit_check_use_case.ts | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/data/usecase/commit_check_use_case.ts b/src/data/usecase/commit_check_use_case.ts index ff6939ce9..c28c91c5f 100644 --- a/src/data/usecase/commit_check_use_case.ts +++ b/src/data/usecase/commit_check_use_case.ts @@ -9,6 +9,7 @@ export class CommitCheckUseCase implements ParamUseCase { taskId: string = 'CommitCheckUseCase'; private issueRepository = new IssueRepository(); private mergeBranchPattern = 'Merge branch ' + private ghAction = 'gh-action: ' private separator = '------------------------------------------------------' async invoke(param: Execution): Promise { @@ -59,6 +60,7 @@ ${commit.message.replaceAll(`${commitPrefix}: `, '')} if ( (commit.message.indexOf(commitPrefix) !== 0 && commitPrefix.length > 0) && commit.message.indexOf(this.mergeBranchPattern) !== 0 + && commit.message.indexOf(this.ghAction) !== 0 ) { shouldWarn = true; } From b21f8071da36a83e83bbeafce7d455693e6d2be4 Mon Sep 17 00:00:00 2001 From: Efra Espada Date: Mon, 2 Dec 2024 21:57:28 +0100 Subject: [PATCH 6/6] gh-action: updated compiled files --- dist/index.js | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/dist/index.js b/dist/index.js index b548854a9..e02646990 100644 --- a/dist/index.js +++ b/dist/index.js @@ -31595,6 +31595,7 @@ class CommitCheckUseCase { this.taskId = 'CommitCheckUseCase'; this.issueRepository = new issue_repository_1.IssueRepository(); this.mergeBranchPattern = 'Merge branch '; + this.ghAction = 'gh-action: '; this.separator = '------------------------------------------------------'; } async invoke(param) { @@ -31637,7 +31638,8 @@ ${commit.message.replaceAll(`${commitPrefix}: `, '')} `; if ((commit.message.indexOf(commitPrefix) !== 0 && commitPrefix.length > 0) - && commit.message.indexOf(this.mergeBranchPattern) !== 0) { + && commit.message.indexOf(this.mergeBranchPattern) !== 0 + && commit.message.indexOf(this.ghAction) !== 0) { shouldWarn = true; } }