From 5160ea213b8cf638d7b695c60a2213f03a649874 Mon Sep 17 00:00:00 2001 From: Rick M Date: Mon, 23 Sep 2024 10:43:58 +0000 Subject: [PATCH 1/2] Move bot signature outside of recheck text --- dist/index.js | 45 ++------------------ src/pullrequest/pullRequestCommentContent.ts | 6 ++- 2 files changed, 8 insertions(+), 43 deletions(-) diff --git a/dist/index.js b/dist/index.js index 047f3201..f0b00cc1 100644 --- a/dist/index.js +++ b/dist/index.js @@ -700,8 +700,9 @@ function dco(signed, committerMap) { text += ' You need a GitHub account to be able to sign the DCO. If you have already a GitHub account, please [add the email address used for this commit to your account](https://help.github.com/articles/why-are-my-commits-linked-to-the-wrong-user/#commits-are-not-linked-to-any-user).
'; } if (input.suggestRecheck() == 'true') { - text += 'You can retrigger this bot by commenting **recheck** in this Pull Request. Posted by the ****DCO Assistant Lite bot****.'; + text += 'You can retrigger this bot by commenting **recheck** in this Pull Request. '; } + text += 'Posted by the ****DCO Assistant Lite bot****.'; return text; } function cla(signed, committerMap) { @@ -736,8 +737,9 @@ function cla(signed, committerMap) { text += ' You need a GitHub account to be able to sign the CLA. If you have already a GitHub account, please [add the email address used for this commit to your account](https://help.github.com/articles/why-are-my-commits-linked-to-the-wrong-user/#commits-are-not-linked-to-any-user).
'; } if (input.suggestRecheck() == 'true') { - text += 'You can retrigger this bot by commenting **recheck** in this Pull Request. Posted by the **CLA Assistant Lite bot**.'; + text += 'You can retrigger this bot by commenting **recheck** in this Pull Request. '; } + text += 'Posted by the **CLA Assistant Lite bot**.'; return text; } @@ -1135,45 +1137,6 @@ function getPrSignComment() { exports.getPrSignComment = getPrSignComment; -/***/ }), - -/***/ 6718: -/***/ (function(__unused_webpack_module, exports, __nccwpck_require__) { - -"use strict"; - -var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { - if (k2 === undefined) k2 = k; - var desc = Object.getOwnPropertyDescriptor(m, k); - if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) { - desc = { enumerable: true, get: function() { return m[k]; } }; - } - Object.defineProperty(o, k2, desc); -}) : (function(o, m, k, k2) { - if (k2 === undefined) k2 = k; - o[k2] = m[k]; -})); -var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) { - Object.defineProperty(o, "default", { enumerable: true, value: v }); -}) : function(o, v) { - o["default"] = v; -}); -var __importStar = (this && this.__importStar) || function (mod) { - if (mod && mod.__esModule) return mod; - var result = {}; - if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k); - __setModuleDefault(result, mod); - return result; -}; -Object.defineProperty(exports, "__esModule", ({ value: true })); -exports.getPrSignComment = void 0; -const input = __importStar(__nccwpck_require__(3611)); -function getPrSignComment() { - return input.getCustomPrSignComment() || "I have read the CLA Document and I hereby sign the CLA"; -} -exports.getPrSignComment = getPrSignComment; - - /***/ }), /***/ 7351: diff --git a/src/pullrequest/pullRequestCommentContent.ts b/src/pullrequest/pullRequestCommentContent.ts index 0cec6f82..70dea089 100644 --- a/src/pullrequest/pullRequestCommentContent.ts +++ b/src/pullrequest/pullRequestCommentContent.ts @@ -52,8 +52,9 @@ function dco(signed: boolean, committerMap: CommitterMap): string { } if (input.suggestRecheck() == 'true') { - text += 'You can retrigger this bot by commenting **recheck** in this Pull Request. Posted by the ****DCO Assistant Lite bot****.' + text += 'You can retrigger this bot by commenting **recheck** in this Pull Request. ' } + text += 'Posted by the ****DCO Assistant Lite bot****.' return text } @@ -96,7 +97,8 @@ function cla(signed: boolean, committerMap: CommitterMap): string { } if (input.suggestRecheck() == 'true') { - text += 'You can retrigger this bot by commenting **recheck** in this Pull Request. Posted by the **CLA Assistant Lite bot**.' + text += 'You can retrigger this bot by commenting **recheck** in this Pull Request. ' } + text += 'Posted by the **CLA Assistant Lite bot**.' return text } From 0230ea8f92089844f8794f24169a4b62424afe4e Mon Sep 17 00:00:00 2001 From: Rick M Date: Mon, 23 Sep 2024 10:49:22 +0000 Subject: [PATCH 2/2] consistent space placement --- dist/index.js | 2 +- src/pullrequest/pullRequestCommentContent.ts | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dist/index.js b/dist/index.js index f0b00cc1..00fffc31 100644 --- a/dist/index.js +++ b/dist/index.js @@ -737,7 +737,7 @@ function cla(signed, committerMap) { text += ' You need a GitHub account to be able to sign the CLA. If you have already a GitHub account, please [add the email address used for this commit to your account](https://help.github.com/articles/why-are-my-commits-linked-to-the-wrong-user/#commits-are-not-linked-to-any-user).
'; } if (input.suggestRecheck() == 'true') { - text += 'You can retrigger this bot by commenting **recheck** in this Pull Request. '; + text += 'You can retrigger this bot by commenting **recheck** in this Pull Request. '; } text += 'Posted by the **CLA Assistant Lite bot**.'; return text; diff --git a/src/pullrequest/pullRequestCommentContent.ts b/src/pullrequest/pullRequestCommentContent.ts index 70dea089..26f5da5f 100644 --- a/src/pullrequest/pullRequestCommentContent.ts +++ b/src/pullrequest/pullRequestCommentContent.ts @@ -97,7 +97,7 @@ function cla(signed: boolean, committerMap: CommitterMap): string { } if (input.suggestRecheck() == 'true') { - text += 'You can retrigger this bot by commenting **recheck** in this Pull Request. ' + text += 'You can retrigger this bot by commenting **recheck** in this Pull Request. ' } text += 'Posted by the **CLA Assistant Lite bot**.' return text