Skip to content

Commit ce255a6

Browse files
vjikStyleCIBot
andauthored
Fix full changelog URL + minor refactor (#331)
Co-authored-by: StyleCI Bot <bot@styleci.io>
1 parent cc47bf5 commit ce255a6

File tree

2 files changed

+9
-16
lines changed

2 files changed

+9
-16
lines changed

.github/workflows/build.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,8 @@ on:
1010
- 'psalm.xml'
1111

1212
push:
13+
branches:
14+
- master
1315
paths-ignore:
1416
- 'docs/**'
1517
- 'README.md'

src/App/Command/Release/MakeCommand.php

Lines changed: 7 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77
use Github\Api\Repository\Releases;
88
use Github\AuthMethod;
99
use Github\Client;
10-
use RuntimeException;
1110
use Symplify\GitWrapper\GitWorkingCopy;
1211
use Symfony\Component\Console\Input\InputArgument;
1312
use Symfony\Component\Console\Input\InputInterface;
@@ -21,6 +20,7 @@
2120
use Yiisoft\YiiDevTool\App\Component\GitHubTokenAware;
2221

2322
use function in_array;
23+
use function sprintf;
2424

2525
final class MakeCommand extends PackageCommand
2626
{
@@ -61,9 +61,7 @@ protected function processPackage(Package $package): void
6161
$io = $this->getIO();
6262
$io->preparePackageHeader($package, 'Releasing {package}');
6363
$git = $package->getGitWorkingCopy();
64-
65-
// Validate GitHub token at the very beginning
66-
$this->getGitHubToken();
64+
$gitHubToken = $this->getGitHubToken();
6765

6866
if (!$package->composerConfigFileExists()) {
6967
$io->warning([
@@ -180,7 +178,7 @@ protected function processPackage(Package $package): void
180178
$git->push();
181179
$git->pushTag((string) $versionToRelease);
182180

183-
$this->releaseOnGithub($package, $versionToRelease);
181+
$this->releaseOnGithub($gitHubToken, $package, $versionToRelease);
184182

185183
$io->done();
186184

@@ -241,28 +239,21 @@ private function getVersionToRelease(Version $currentVersion): Version
241239
return $nextVersion;
242240
}
243241

244-
private function releaseOnGithub(Package $package, Version $versionToRelease): void
242+
private function releaseOnGithub(string $token, Package $package, Version $versionToRelease): void
245243
{
246244
$io = $this->getIO();
247245
$io->info("Creating release on GitHub for $versionToRelease.\n");
248246

249247
$client = new Client();
250-
try {
251-
$token = $this->getGitHubToken();
252-
} catch (RuntimeException $e) {
253-
$io->error($e->getMessage());
254-
$io->warning('Skipped creating release on GitHub.');
255-
return;
256-
}
257248
$changelogPath = $package->getPath() . '/CHANGELOG.md';
258249
$changelog = new Changelog($changelogPath);
259250
$client->authenticate($token, null, AuthMethod::ACCESS_TOKEN);
260251
$release = new Releases($client);
261252

262-
263-
$changelogUrl = "https://github.com/yiisoft/$packageName/blob/$versionToRelease/CHANGELOG.md";
264253
$body = implode("\n", $changelog->getReleaseNotes($versionToRelease));
265-
$body .= "\n\n[Full changelog]({$changelogUrl})";
254+
255+
$changelogUrl = "https://github.com/yiisoft/{$package->getName()}/blob/$versionToRelease/CHANGELOG.md";
256+
$body .= "\n\n[Full changelog]($changelogUrl)";
266257

267258
$release->create($package->getVendor(), $package->getId(), [
268259
'name' => sprintf('Version %s', $versionToRelease),

0 commit comments

Comments
 (0)