diff --git a/.gitlab/dangerfile.js b/.gitlab/dangerfile.js index 9dafd00a82e1..945360e3e4d5 100644 --- a/.gitlab/dangerfile.js +++ b/.gitlab/dangerfile.js @@ -1,4 +1,4 @@ -import { danger, warn, message } from "danger" +import { danger, warn, message, results } from "danger" /** * Check if MR Title contains prefix "Draft: ... or "WIP: ...". @@ -62,10 +62,15 @@ function checkMrJiraLinks() { const mrCommitMessages = danger.gitlab.commits.map(commit => commit.message); const matchBlockRelated = mrDescription.match(/\#\# Related.*$/s); // Match MR description starting with line ## Related till the end of MR description + const noRelatedIssues = /No related issues/.test(matchBlockRelated ? matchBlockRelated[0] : ''); // Check if there is "No related issues" const testJiraLabels = /[A-Z]+-[0-9]+/.test(matchBlockRelated ? matchBlockRelated[0] : ''); // Test if pattern of Jira label "JIRA-1234" or "RDT-311" is in section Related const ghIssueTicket = /IDFGH-[0-9]+/.test(matchBlockRelated ? matchBlockRelated[0] : ''); // Check if there is JIRA link starts with "IDFGH-*" in MR description, section "Related" const testGithubLink = /Closes https:\/\/github\.com\/espressif\/esp-idf\/issues\/[0-9]+/ + if (mrDescription.toUpperCase().includes("## RELATED") && noRelatedIssues) { + return + } + if (!mrDescription.toUpperCase().includes("## RELATED") || !testJiraLabels) { // Missing section "Related" or missing links to JIRA tickets return warn("Please add links to JIRA issues to the MR description section `Related`."); @@ -177,3 +182,10 @@ function addRetryLink() { return markdown(`***\n#### :repeat: If you want to run these checks again, please retry this [DangerJS job](${retryLink})\n***`); } addRetryLink(); + +function printSuccessLog() { + if (results.fails.length === 0 && results.warnings.length === 0 && results.messages.length === 0) { + return message('Good Job! All checks are passing!') + } +} +printSuccessLog(); diff --git a/.gitlab/merge_request_templates/Minimal_Template.md b/.gitlab/merge_request_templates/Minimal_Template.md index c65b0bc57a2f..b020d3cba5c9 100644 --- a/.gitlab/merge_request_templates/Minimal_Template.md +++ b/.gitlab/merge_request_templates/Minimal_Template.md @@ -7,7 +7,7 @@ ## Related - + ## Release notes