From 55b758c49477dfb00ee5c49658552b87ae22fe72 Mon Sep 17 00:00:00 2001 From: Brian Seeders Date: Tue, 16 Feb 2021 13:48:50 -0500 Subject: [PATCH] Remove global backport instruction from comment --- backport/createStatusComment.js | 2 -- backport/createStatusComment.test.ts | 8 ++------ backport/createStatusComment.ts | 2 -- 3 files changed, 2 insertions(+), 10 deletions(-) diff --git a/backport/createStatusComment.js b/backport/createStatusComment.js index 42746a2..9aa8a13 100644 --- a/backport/createStatusComment.js +++ b/backport/createStatusComment.js @@ -24,8 +24,6 @@ exports.getCommentFromResponse = (pullNumber, backportResponse) => { helpParts.push([ 'To backport manually, check out the target branch and run:', `\`node scripts/backport --pr ${pullNumber}\``, - 'or', - `\`backport --labels backport --pr ${pullNumber}\``, ].join('\n')); } const helpMessage = helpParts.join('\n\n'); diff --git a/backport/createStatusComment.test.ts b/backport/createStatusComment.test.ts index dc86985..e0e8b0e 100644 --- a/backport/createStatusComment.test.ts +++ b/backport/createStatusComment.test.ts @@ -56,9 +56,7 @@ Successful backport PRs will be merged automatically after passing CI.`, Successful backport PRs will be merged automatically after passing CI. To backport manually, check out the target branch and run: -\`node scripts/backport --pr 1\` -or -\`backport --labels backport --pr 1\``, +\`node scripts/backport --pr 1\``, ); }); @@ -86,9 +84,7 @@ or ❌ 7.10: There was a merge conflict To backport manually, check out the target branch and run: -\`node scripts/backport --pr 1\` -or -\`backport --labels backport --pr 1\``, +\`node scripts/backport --pr 1\``, ); }); }); diff --git a/backport/createStatusComment.ts b/backport/createStatusComment.ts index e22b819..0d429c9 100644 --- a/backport/createStatusComment.ts +++ b/backport/createStatusComment.ts @@ -32,8 +32,6 @@ export const getCommentFromResponse = (pullNumber: number, backportResponse: Bac [ 'To backport manually, check out the target branch and run:', `\`node scripts/backport --pr ${pullNumber}\``, - 'or', - `\`backport --labels backport --pr ${pullNumber}\``, ].join('\n'), ); }