From a0b98e99455b085b33ab4c9548331f466b184299 Mon Sep 17 00:00:00 2001 From: Fu Hanxi Date: Thu, 16 Mar 2023 20:44:26 +0800 Subject: [PATCH 1/2] ci: fix dangerjs "closes anything_but_not_a_jira_link" --- .gitlab/dangerjs/mrDescriptionJiraLinks.js | 27 ++++++++++++---------- 1 file changed, 15 insertions(+), 12 deletions(-) diff --git a/.gitlab/dangerjs/mrDescriptionJiraLinks.js b/.gitlab/dangerjs/mrDescriptionJiraLinks.js index 4212c4f89f..e5afe8f6ca 100644 --- a/.gitlab/dangerjs/mrDescriptionJiraLinks.js +++ b/.gitlab/dangerjs/mrDescriptionJiraLinks.js @@ -139,18 +139,21 @@ module.exports = async function () { const correctJiraClosingLinkFormat = new RegExp( `^- Closes ${jiraTicketRegex.source}$` ); - if (!correctJiraClosingLinkFormat.test(line)) { - closingTickets.push({ - record: line, - ticketName: line.match(jiraTicketRegex)[0], - correctFormat: false, - }); - } else { - closingTickets.push({ - record: line, - ticketName: line.match(jiraTicketRegex)[0], - correctFormat: true, - }); + const matchedJiraTicket = line.match(jiraTicketRegex); + if (jiraTicketMatched) { + if (!correctJiraClosingLinkFormat.test(line)) { + closingTickets.push({ + record: line, + ticketName: matchedJiraTicket[0], + correctFormat: false, + }); + } else { + closingTickets.push({ + record: line, + ticketName: matchedJiraTicket[0], + correctFormat: true, + }); + } } } return closingTickets; From c097f5dbc39c353c232fba4c13344aa87bab4af7 Mon Sep 17 00:00:00 2001 From: Fu Hanxi Date: Thu, 16 Mar 2023 21:00:57 +0800 Subject: [PATCH 2/2] Update .gitlab/dangerjs/mrDescriptionJiraLinks.js --- .gitlab/dangerjs/mrDescriptionJiraLinks.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab/dangerjs/mrDescriptionJiraLinks.js b/.gitlab/dangerjs/mrDescriptionJiraLinks.js index e5afe8f6ca..73497c9717 100644 --- a/.gitlab/dangerjs/mrDescriptionJiraLinks.js +++ b/.gitlab/dangerjs/mrDescriptionJiraLinks.js @@ -140,7 +140,7 @@ module.exports = async function () { `^- Closes ${jiraTicketRegex.source}$` ); const matchedJiraTicket = line.match(jiraTicketRegex); - if (jiraTicketMatched) { + if (matchedJiraTicket) { if (!correctJiraClosingLinkFormat.test(line)) { closingTickets.push({ record: line,