Cavemanon/piratepoet
7
Fork 0
Code Pull Requests Actions Releases 16 Activity

Skip "Won't Do" issues from changelog

Browse Source 
[MAILPOET-1867]
This commit is contained in:
Ján Mikláš
2019-03-21 15:37:27 +01:00
committed by Pavel Dohnal
parent f10014d864
commit 7a8ba52b57
2 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
tasks/release/ChangelogController.php
View File

@ -50,7 +50,10 @@ class ChangelogController {
private function renderList(array $issues, $field) { private function renderList(array $issues, $field) {
$messages = []; $messages = [];
foreach ($issues as $issue) { foreach ($issues as $issue) {
if (!isset($issue['fields'][$field])) { if (
!isset($issue['fields'][$field])
|| ($issue['fields']['resolution']['id'] === Jira::WONT_DO_RESOLUTION_ID)
) {
continue; continue;
} }
$messages[] = "* " . $this->sanitizePunctuation($issue['fields'][$field], ';'); $messages[] = "* " . $this->sanitizePunctuation($issue['fields'][$field], ';');

4
tasks/release/Jira.php
View File

@ -7,6 +7,8 @@ class Jira {
const CHANGELOG_FIELD_ID = 'customfield_10500'; const CHANGELOG_FIELD_ID = 'customfield_10500';
const RELEASENOTE_FIELD_ID = 'customfield_10504'; const RELEASENOTE_FIELD_ID = 'customfield_10504';
const WONT_DO_RESOLUTION_ID = '10001';
const PROJECT_MAILPOET = 'MAILPOET'; const PROJECT_MAILPOET = 'MAILPOET';
const PROJECT_PREMIUM = 'PREMIUM'; const PROJECT_PREMIUM = 'PREMIUM';
@ -60,7 +62,7 @@ class Jira {
function getIssuesDataForVersion($version) { function getIssuesDataForVersion($version) {
$changelog_id = self::CHANGELOG_FIELD_ID; $changelog_id = self::CHANGELOG_FIELD_ID;
$release_note_id = self::RELEASENOTE_FIELD_ID; $release_note_id = self::RELEASENOTE_FIELD_ID;
$issues_data = $this->search("fixVersion={$version['id']}", ['key', $changelog_id, $release_note_id, 'status']); $issues_data = $this->search("fixVersion={$version['id']}", ['key', $changelog_id, $release_note_id, 'status', 'resolution']);
// Sort issues by importance of change (Added -> Updated -> Improved -> Changed -> Fixed -> Others) // Sort issues by importance of change (Added -> Updated -> Improved -> Changed -> Fixed -> Others)
usort($issues_data['issues'], function($a, $b) use ($changelog_id) { usort($issues_data['issues'], function($a, $b) use ($changelog_id) {
$order = array_flip(['added', 'updat', 'impro', 'chang', 'fixed']); $order = array_flip(['added', 'updat', 'impro', 'chang', 'fixed']);