feedc0de/esp-idf
1
0
Fork 0
forked from espressif/esp-idf
Code Pull Requests Activity

ci:danger: Fix regex for Jira ticket format

Browse Source
This commit is contained in:
Tomas Sebestik
2023-03-08 15:29:08 +01:00
parent 05037957c7
commit 839e15df92
1 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
.gitlab/dangerjs/mrDescriptionJiraLinks.js
View File

@@ -15,6 +15,7 @@ module.exports = async function () {
const mrCommitMessages = danger.gitlab.commits.map( const mrCommitMessages = danger.gitlab.commits.map(
(commit) => commit.message (commit) => commit.message
); );
const jiraTicketRegex = /[A-Z0-9]+-[0-9]+/;
let partMessages = []; // Create a blank field for future records of individual issues let partMessages = []; // Create a blank field for future records of individual issues
@@ -23,7 +24,7 @@ module.exports = async function () {
if ( if (
!sectionRelated.header || // No section Related in MR description or ... !sectionRelated.header || // No section Related in MR description or ...
!/\s[A-Z]+-[0-9]+\s/.test(sectionRelated.content) // no Jira links in section Related !jiraTicketRegex.test(sectionRelated.content) // no Jira links in section Related
) { ) {
return message( return message(
"Please consider adding references to JIRA issues in the `Related` section of the MR description." "Please consider adding references to JIRA issues in the `Related` section of the MR description."
@@ -38,7 +39,7 @@ module.exports = async function () {
if (!ticket.correctFormat) { if (!ticket.correctFormat) {
partMessages.push( partMessages.push(
`- closing ticket \`${ticket.record}\` seems to be in the incorrect format. The correct format is for example \`- Closes JIRA-123\`` `- closing ticket \`${ticket.record}\` seems to be in the wrong format (or inaccessible to Jira DangerBot).. The correct format is for example \`- Closes JIRA-123\`.`
); );
} }
@@ -135,17 +136,19 @@ module.exports = async function () {
continue; // Not closing-type ticket, skip continue; // Not closing-type ticket, skip
} }
const correctJiraClosingLinkFormat = /^- Closes [A-Z]+\-\d+$/; const correctJiraClosingLinkFormat = new RegExp(
`^- Closes ${jiraTicketRegex.source}$`
);
if (!correctJiraClosingLinkFormat.test(line)) { if (!correctJiraClosingLinkFormat.test(line)) {
closingTickets.push({ closingTickets.push({
record: line, record: line,
ticketName: line.match(/[A-Z]+\-\d+/)[0], ticketName: line.match(jiraTicketRegex)[0],
correctFormat: false, correctFormat: false,
}); });
} else { } else {
closingTickets.push({ closingTickets.push({
record: line, record: line,
ticketName: line.match(/[A-Z]+\-\d+/)[0], ticketName: line.match(jiraTicketRegex)[0],
correctFormat: true, correctFormat: true,
}); });
} }