diff --git a/module/ci/model.php b/module/ci/model.php index c502c2cfba..2a1856cc25 100644 --- a/module/ci/model.php +++ b/module/ci/model.php @@ -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; diff --git a/module/gitfox/model.php b/module/gitfox/model.php index 075ab2dc06..e318832ccd 100644 --- a/module/gitfox/model.php +++ b/module/gitfox/model.php @@ -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 diff --git a/module/gitlab/model.php b/module/gitlab/model.php index 7252365ad4..a76af060b6 100644 --- a/module/gitlab/model.php +++ b/module/gitlab/model.php @@ -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 diff --git a/module/instance/model.php b/module/instance/model.php index a91003c3c0..7854d23b87 100644 --- a/module/instance/model.php +++ b/module/instance/model.php @@ -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