Skip to content

Commit 56051ab

Browse files
authored
Merge pull request #160 from nextcloud/fix/changelog-new-app-output-and-title
fix(changelog): fix new-app stdout pollution and wrong release title
2 parents 19cdae6 + d6c5a69 commit 56051ab

1 file changed

Lines changed: 6 additions & 8 deletions

File tree

changelog/index.php

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -293,6 +293,8 @@ protected function execute(InputInterface $input, OutputInterface $output)
293293
$output->writeln('<error>No version detected - the output will not contain any pending PRs. Use a git tag starting with "v" like "v13.0.5".</error>');
294294
}
295295

296+
$displayVersion = (substr($head, 0, 1) === 'v') ? substr($head, 1) : ($milestoneToCheck ?? $head);
297+
296298
$prTitles = ['closed' => [], 'pending' => []];
297299

298300
# TODO
@@ -351,17 +353,13 @@ protected function execute(InputInterface $input, OutputInterface $output)
351353
$effectiveBase = $info['default_branch'];
352354
}
353355
if (in_array($repoName, $newApps)) {
354-
$output->writeln('<info>' . $repoName . ' is new in this release.</info>');
355-
// print 3 empty lines to not overwrite the message with the progress bar
356-
$output->writeln('');
357-
$output->writeln('');
358-
$output->writeln('');
359356
$prTitles['closed'][$repoName . '#0'] = [
360357
'repoName' => $repoName,
361358
'number' => 0,
362359
'title' => 'Newly added in this release',
363360
'newApp' => true,
364361
];
362+
$progressBar->setMessage("$repoName is new in this release.");
365363
$progressBar->advance();
366364
continue;
367365
}
@@ -542,7 +540,7 @@ protected function execute(InputInterface $input, OutputInterface $output)
542540

543541
switch ($format) {
544542
case 'html':
545-
$version = $milestoneToCheck;
543+
$version = $displayVersion;
546544
$versionDashed = str_replace('.', '-', $version);
547545
$date = new \DateTime('now');
548546
$date = $date->add(new \DateInterval('P1D'));
@@ -577,7 +575,7 @@ protected function execute(InputInterface $input, OutputInterface $output)
577575
break;
578576
case 'forum':
579577
// Making it a second heading as the first one is the title of the post
580-
$output->writeln("## Nextcloud " . $milestoneToCheck);
578+
$output->writeln("## Nextcloud " . $displayVersion);
581579
$closedPRs = $this->groupPRsByRepo($prTitles['closed']);
582580
foreach ($closedPRs as $repo => $prs) {
583581
$output->writeln("\n### [$repo](https://github.com/$orgName/$repo)");
@@ -595,7 +593,7 @@ protected function execute(InputInterface $input, OutputInterface $output)
595593
break;
596594
case 'markdown':
597595
default:
598-
$output->writeln("## Nextcloud " . $milestoneToCheck);
596+
$output->writeln("## Nextcloud " . $displayVersion);
599597
$closedPRs = $this->groupPRsByRepo($prTitles['closed']);
600598
foreach ($closedPRs as $repo => $prs) {
601599
$output->writeln("\n### [$repo](https://github.com/$orgName/$repo)");

0 commit comments

Comments
 (0)