* Fix typo.
This commit is contained in:
+4
-4
@@ -258,18 +258,18 @@ class ciModel extends model
|
||||
{
|
||||
/* The value of `$compile->pipeline` is like `'{"project":"46", "name": "test", "reference":"master"}'` in current design. */
|
||||
$pipeline = json_decode($compile->pipeline);
|
||||
$compile->project = isset($pipeline->project) ? (int)$pipeline->project : (int)$compile->pipeline;
|
||||
$compile->pipline = zget($pipeline, 'name', '');
|
||||
$compile->project = isset($pipeline->project) ? (int)$pipeline->project : (int)$compile->pipeline;
|
||||
$compile->pipeline = zget($pipeline, 'name', '');
|
||||
|
||||
$now = helper::now();
|
||||
$pipeline = $this->loadModel('gitfox')->apiGetSinglePipeline($compile->server, $compile->project, $compile->pipline, $compile->queue);
|
||||
$pipeline = $this->loadModel('gitfox')->apiGetSinglePipeline($compile->server, $compile->project, $compile->pipeline, $compile->queue);
|
||||
if(!isset($pipeline->number) || isset($pipeline->message)) /* The pipeline is not available. */
|
||||
{
|
||||
$this->dao->update(TABLE_JOB)->set('lastExec')->eq($now)->set('lastStatus')->eq('create_fail')->where('id')->eq($compile->job)->exec();
|
||||
return false;
|
||||
}
|
||||
|
||||
$pipeline->name = $compile->pipline;
|
||||
$pipeline->name = $compile->pipeline;
|
||||
$logs = $this->gitfox->apiGetPipelineLogs($compile->server, $compile->project, $pipeline);
|
||||
$data = new stdclass;
|
||||
$data->status = $pipeline->status;
|
||||
|
||||
@@ -553,7 +553,7 @@ class gitfoxModel extends model
|
||||
|
||||
/**
|
||||
* 通过api获取一个流水线。
|
||||
* Get single pipline by api.
|
||||
* Get single pipeline by api.
|
||||
*
|
||||
* @param int $gitfoxID
|
||||
* @param int $projectID
|
||||
@@ -571,7 +571,7 @@ class gitfoxModel extends model
|
||||
|
||||
/**
|
||||
* 通过api获取一个流水线日志。
|
||||
* Get single pipline logs by api.
|
||||
* Get single pipeline logs by api.
|
||||
*
|
||||
* @param int $gitfoxID
|
||||
* @param int $projectID
|
||||
|
||||
@@ -1306,7 +1306,7 @@ class gitlabModel extends model
|
||||
|
||||
/**
|
||||
* 通过api获取一个流水线。
|
||||
* Get single pipline by api.
|
||||
* Get single pipeline by api.
|
||||
*
|
||||
* @param int $gitlabID
|
||||
* @param int $projectID
|
||||
|
||||
@@ -1033,8 +1033,8 @@ class instanceModel extends model
|
||||
}
|
||||
|
||||
/**
|
||||
* 自动生成pipline表name字段。
|
||||
* Auto generate name of pipline table.
|
||||
* 自动生成pipeline表name字段。
|
||||
* Auto generate name of pipeline table.
|
||||
*
|
||||
* @param object $instance
|
||||
* @access protected
|
||||
|
||||
Reference in New Issue
Block a user