Fix
This commit is contained in:
parent
f747371c6d
commit
fbc3da59dd
|
@ -249,25 +249,4 @@ class Build extends BuildBase
|
|||
|
||||
exec(sprintf(IS_WIN ? 'rmdir /S /Q "%s"' : 'rm -Rf "%s"', $buildPath));
|
||||
}
|
||||
|
||||
/**
|
||||
* @param Project $value
|
||||
*/
|
||||
public function setProjectObject(\PHPCI\Model\Project $value)
|
||||
{
|
||||
$this->data['project'] = $value;
|
||||
return parent::setProjectObject($value);
|
||||
}
|
||||
|
||||
/**
|
||||
* Get the Project model for this Build by Id.
|
||||
*/
|
||||
public function getProject()
|
||||
{
|
||||
if (empty($this->data['project'])) {
|
||||
$this->data['project'] = parent::getProject();
|
||||
}
|
||||
|
||||
return $this->data['project'];
|
||||
}
|
||||
}
|
||||
|
|
|
@ -87,9 +87,13 @@ class BuildService
|
|||
|
||||
$build = $this->buildStore->save($build);
|
||||
|
||||
$build = BuildFactory::getBuild($build);
|
||||
$build->sendStatusPostback();
|
||||
$this->addBuildToQueue($build);
|
||||
$buildId = $build->getId();
|
||||
|
||||
if (!empty($buildId)) {
|
||||
$build = BuildFactory::getBuild($build);
|
||||
$build->sendStatusPostback();
|
||||
$this->addBuildToQueue($build);
|
||||
}
|
||||
|
||||
return $build;
|
||||
}
|
||||
|
@ -116,9 +120,13 @@ class BuildService
|
|||
|
||||
$build = $this->buildStore->save($build);
|
||||
|
||||
$build = BuildFactory::getBuild($build);
|
||||
$build->sendStatusPostback();
|
||||
$this->addBuildToQueue($build);
|
||||
$buildId = $build->getId();
|
||||
|
||||
if (!empty($buildId)) {
|
||||
$build = BuildFactory::getBuild($build);
|
||||
$build->sendStatusPostback();
|
||||
$this->addBuildToQueue($build);
|
||||
}
|
||||
|
||||
return $build;
|
||||
}
|
||||
|
|
|
@ -101,13 +101,9 @@ class BuildServiceTest extends \PHPUnit_Framework_TestCase
|
|||
*/
|
||||
public function testExecute_CreateDuplicateBuild()
|
||||
{
|
||||
$project = new Project();
|
||||
$project->setType('hg');
|
||||
$project->setId(101);
|
||||
|
||||
$build = new Build();
|
||||
$build->setId(1);
|
||||
$build->setProject($project);
|
||||
$build->setProject(101);
|
||||
$build->setCommitId('abcde');
|
||||
$build->setStatus(Build::STATUS_FAILED);
|
||||
$build->setLog('Test');
|
||||
|
|
Loading…
Reference in a new issue