From b02856b1fce818ad5f2e8cb1cc70805fa7033c6a Mon Sep 17 00:00:00 2001
From: Rhys Arkins <rhys@arkins.net>
Date: Fri, 12 May 2023 08:18:49 +0200
Subject: [PATCH] fix: massage rebase check PR comment (#22079)
---
lib/modules/platform/azure/index.ts | 4 ++++
lib/modules/platform/bitbucket-server/index.ts | 4 ++++
lib/modules/platform/bitbucket/index.ts | 4 ++++
lib/modules/platform/codecommit/index.ts | 4 ++++
4 files changed, 16 insertions(+)
diff --git a/lib/modules/platform/azure/index.ts b/lib/modules/platform/azure/index.ts
index f5b3910663..3790df6c75 100644
--- a/lib/modules/platform/azure/index.ts
+++ b/lib/modules/platform/azure/index.ts
@@ -775,6 +775,10 @@ export function massageMarkdown(input: string): string {
'you tick the rebase/retry checkbox',
'rename PR to start with "rebase!"'
)
+ .replace(
+ 'checking the rebase/retry box above',
+ 'renaming the PR to start with "rebase!"'
+ )
.replace(regEx(`\n---\n\n.*?<!-- rebase-check -->.*?\n`), '')
.replace(regEx(/<!--renovate-(?:debug|config-hash):.*?-->/g), '');
}
diff --git a/lib/modules/platform/bitbucket-server/index.ts b/lib/modules/platform/bitbucket-server/index.ts
index b8258e5804..5ce4aa5e9a 100644
--- a/lib/modules/platform/bitbucket-server/index.ts
+++ b/lib/modules/platform/bitbucket-server/index.ts
@@ -974,6 +974,10 @@ export function massageMarkdown(input: string): string {
'you tick the rebase/retry checkbox',
'rename PR to start with "rebase!"'
)
+ .replace(
+ 'checking the rebase/retry box above',
+ 'renaming the PR to start with "rebase!"'
+ )
.replace(regEx(/<\/?summary>/g), '**')
.replace(regEx(/<\/?details>/g), '')
.replace(regEx(`\n---\n\n.*?<!-- rebase-check -->.*?(\n|$)`), '')
diff --git a/lib/modules/platform/bitbucket/index.ts b/lib/modules/platform/bitbucket/index.ts
index b76e665768..979384249c 100644
--- a/lib/modules/platform/bitbucket/index.ts
+++ b/lib/modules/platform/bitbucket/index.ts
@@ -519,6 +519,10 @@ export function massageMarkdown(input: string): string {
'you tick the rebase/retry checkbox',
'by renaming this PR to start with "rebase!"'
)
+ .replace(
+ 'checking the rebase/retry box above',
+ 'renaming the PR to start with "rebase!"'
+ )
.replace(regEx(/<\/?summary>/g), '**')
.replace(regEx(/<\/?(details|blockquote)>/g), '')
.replace(regEx(`\n---\n\n.*?<!-- rebase-check -->.*?\n`), '')
diff --git a/lib/modules/platform/codecommit/index.ts b/lib/modules/platform/codecommit/index.ts
index e689415cb3..0e93116c88 100644
--- a/lib/modules/platform/codecommit/index.ts
+++ b/lib/modules/platform/codecommit/index.ts
@@ -307,6 +307,10 @@ export function massageMarkdown(input: string): string {
'you tick the rebase/retry checkbox',
'rename PR to start with "rebase!"'
)
+ .replace(
+ 'checking the rebase/retry box above',
+ 'renaming the PR to start with "rebase!"'
+ )
.replace(regEx(/<\/?summary>/g), '**')
.replace(regEx(/<\/?details>/g), '')
.replace(regEx(`\n---\n\n.*?<!-- rebase-check -->.*?\n`), '')
--
GitLab