diff --git a/.github/libs/GithubUtils.js b/.github/libs/GithubUtils.js index 214b6a24ffbd..cb43fa626434 100644 --- a/.github/libs/GithubUtils.js +++ b/.github/libs/GithubUtils.js @@ -126,7 +126,7 @@ class GithubUtils { } PRListSection = PRListSection[1]; const unverifiedPRs = _.map( - [...PRListSection.matchAll(new RegExp(`- (${PULL_REQUEST_REGEX.source})[\r\n]\\s+- \\[ \\] QA`, 'g'))], + [...PRListSection.matchAll(new RegExp(`(${PULL_REQUEST_REGEX.source})[\r\n]\\s+- \\[ \\] QA`, 'g'))], match => ({ url: match[1], number: GithubUtils.getPullRequestNumberFromURL(match[1]), @@ -134,7 +134,7 @@ class GithubUtils { }), ); const verifiedPRs = _.map( - [...PRListSection.matchAll(new RegExp(`- (${PULL_REQUEST_REGEX.source})[\r\n]\\s+- \\[x\\] QA`, 'g'))], + [...PRListSection.matchAll(new RegExp(`(${PULL_REQUEST_REGEX.source})[\r\n]\\s+- \\[x\\] QA`, 'g'))], match => ({ url: match[1], number: GithubUtils.getPullRequestNumberFromURL(match[1]), @@ -162,7 +162,7 @@ class GithubUtils { } deployBlockerSection = deployBlockerSection[1]; const unresolvedDeployBlockers = _.map( - [...deployBlockerSection.matchAll(new RegExp(`- (${ISSUE_OR_PULL_REQUEST_REGEX.source})[\r\n]\\s+- \\[ \\] QA`, 'g'))], + [...deployBlockerSection.matchAll(new RegExp(`(${ISSUE_OR_PULL_REQUEST_REGEX.source})[\r\n]\\s+- \\[ \\] QA`, 'g'))], match => ({ url: match[1], number: GithubUtils.getIssueOrPullRequestNumberFromURL(match[1]), @@ -170,7 +170,7 @@ class GithubUtils { }), ); const resolvedDeployBlockers = _.map( - [...deployBlockerSection.matchAll(new RegExp(`- (${ISSUE_OR_PULL_REQUEST_REGEX.source})[\r\n]\\s+- \\[x\\] QA`, 'g'))], + [...deployBlockerSection.matchAll(new RegExp(`(${ISSUE_OR_PULL_REQUEST_REGEX.source})[\r\n]\\s+- \\[x\\] QA`, 'g'))], match => ({ url: match[1], number: GithubUtils.getIssueOrPullRequestNumberFromURL(match[1]), @@ -227,7 +227,7 @@ class GithubUtils { if (!_.isEmpty(sortedPRList)) { issueBody += '\r\n**This release contains changes from the following pull requests:**'; _.each(sortedPRList, (URL) => { - issueBody += `\r\n\r\n- ${URL}`; + issueBody += `\r\n\r\n${URL}`; issueBody += _.contains(verifiedPRList, URL) ? '\r\n - [x] QA' : '\r\n - [ ] QA'; issueBody += _.contains(accessabilityPRList, URL) ? '\r\n - [x] Accessibility' : '\r\n - [ ] Accessibility'; }); @@ -237,7 +237,7 @@ class GithubUtils { if (!_.isEmpty(deployBlockers)) { issueBody += '\r\n\r\n\r\n**Deploy Blockers:**'; _.each(sortedDeployBlockers, (URL) => { - issueBody += `\r\n\r\n- ${URL}`; + issueBody += `\r\n\r\n${URL}`; issueBody += _.contains(resolvedDeployBlockers, URL) ? '\r\n - [x] QA' : '\r\n - [ ] QA'; issueBody += _.contains(accessabilityPRList, URL) ? '\r\n - [x] Accessibility' : '\r\n - [ ] Accessibility'; }); @@ -321,7 +321,7 @@ class GithubUtils { static getReleaseBody(pullRequests) { return _.map( pullRequests, - number => `- ${this.getPullRequestURLFromNumber(number)}`, + number => `${this.getPullRequestURLFromNumber(number)}`, ).join('\r\n'); }