* Fix bug #38213.
This commit is contained in:
@@ -383,7 +383,7 @@ class job extends control
|
||||
//if(strtolower($job->engine) == 'gitlab' and (!isset($job->reference) or !$job->reference)) return $this->send(array('result' => 'fail', 'message' => $this->lang->job->setReferenceTips, 'locate' => inlink('edit', "id=$jobID")));
|
||||
|
||||
$compile = $this->job->exec($jobID);
|
||||
if(dao::isError()) return $this->sendError(dao::getError());
|
||||
if(dao::isError()) return $this->sendError(implode('\n', dao::getError()));
|
||||
|
||||
$this->app->loadLang('compile');
|
||||
$this->loadModel('action')->create('job', $jobID, 'executed');
|
||||
|
||||
@@ -591,7 +591,11 @@ class jobModel extends model
|
||||
$compile = new stdclass;
|
||||
|
||||
$pipeline = $this->loadModel('gitlab')->apiCreatePipeline($job->server, $pipeline->project, $pipelineParams);
|
||||
if(empty($pipeline->id)) $compile->status = 'create_fail';
|
||||
if(empty($pipeline->id))
|
||||
{
|
||||
$this->gitlab->apiErrorHandling($pipeline);
|
||||
$compile->status = 'create_fail';
|
||||
}
|
||||
|
||||
if(!empty($pipeline->id))
|
||||
{
|
||||
|
||||
Reference in New Issue
Block a user