Fixed migration for pull request branches.
This commit is contained in:
parent
3400271bc5
commit
0cfb12f222
|
@ -15,14 +15,14 @@ class AddedRequestBranchToBuild extends AbstractMigration
|
|||
$count = 100;
|
||||
$offset = 0;
|
||||
while ($count >= 100) {
|
||||
$builds = $buildStore->getBuilds(100, $offset);
|
||||
$offset =+ 100;
|
||||
$count = count($builds);
|
||||
$builds = $buildStore->getBuilds(100, $offset);
|
||||
$offset += 100;
|
||||
$count = count($builds);
|
||||
|
||||
/** @var Build $build */
|
||||
foreach ($builds as &$build) {
|
||||
$extra = $build->getExtra();
|
||||
if (isset($extra['build_type']) && 'pull_request' === $extra['build_type']) {
|
||||
if (isset($extra['build_type'])) {
|
||||
unset($extra['build_type']);
|
||||
|
||||
$build->setSource(Build::SOURCE_WEBHOOK_PULL_REQUEST);
|
||||
|
@ -39,11 +39,11 @@ class AddedRequestBranchToBuild extends AbstractMigration
|
|||
if ($remoteReference && empty($extra['remote_reference'])) {
|
||||
$extra['remote_reference'] = $remoteReference;
|
||||
}
|
||||
|
||||
unset($extra['remote_url']);
|
||||
}
|
||||
unset($extra['build_type']);
|
||||
unset($extra['pull_request_id']);
|
||||
|
||||
$build->setExtra($extra);
|
||||
$build->setExtra(json_encode($extra));
|
||||
$buildStore->save($build);
|
||||
}
|
||||
unset($build);
|
||||
|
|
|
@ -159,17 +159,17 @@
|
|||
</td>
|
||||
|
||||
<td>
|
||||
<?php $branches = $build->getExtra('branches'); ?>
|
||||
<a href="<?= $build->getBranchLink();?>">
|
||||
<i class="fa fa-code-fork"></i>
|
||||
<?= $build->getBranch(); ?>
|
||||
</a>
|
||||
<?php if (\PHPCensor\Model\Build::SOURCE_WEBHOOK_PULL_REQUEST === $build->getSource()): ?>
|
||||
<a href="<?= $build->getRemoteBranchLink(); ?>">
|
||||
<i class="fa fa-code-fork"></i>
|
||||
<?= $build->getRemoteBranch(); ?> :
|
||||
</a>
|
||||
<?php endif; ?>
|
||||
<a href="<?= $build->getBranchLink();?>">
|
||||
<i class="fa fa-code-fork"></i>
|
||||
<?= $build->getBranch(); ?>
|
||||
</a>
|
||||
<?php $branches = $build->getExtra('branches'); ?>
|
||||
<?= $branches ? ' + '.implode(', ', $branches) : ''; ?>
|
||||
<?php if ($tag = $build->getTag()): ?> /
|
||||
<a href="<?= $build->getTagLink(); ?>">
|
||||
|
|
Loading…
Reference in a new issue