diff --git a/module/ci/control.php b/module/ci/control.php index 2ea114e597..cc4906dba6 100644 --- a/module/ci/control.php +++ b/module/ci/control.php @@ -55,7 +55,7 @@ class ci extends control $compiles = $this->loadModel('compile')->getUnexecutedList(); foreach($compiles as $compile) { - if(!$compile->atTime || date('H:i') < $compile->atTime) continue; + if($compile->atTime && date('H:i') < $compile->atTime) continue; $this->compile->exec($compile); } diff --git a/module/compile/model.php b/module/compile/model.php index c47963cb35..51d586cc41 100644 --- a/module/compile/model.php +++ b/module/compile/model.php @@ -413,9 +413,9 @@ class compileModel extends model $this->loadModel('job'); $result = new stdclass(); - if($job->engine == 'gitlab') $result = $this->job->execGitlabPipeline($job, $compileID); + if($job->engine == 'gitlab') $result = $this->job->execGitlabPipeline($job); if($job->engine == 'jenkins') $result = $this->job->execJenkinsPipeline($job, $repo, $compileID); - if($job->engine == 'gitfox') $result = $this->job->execGitfoxPipeline($job, $compileID); + if($job->engine == 'gitfox') $result = $this->job->execGitfoxPipeline($job); $this->dao->update(TABLE_COMPILE)->data($result)->where('id')->eq($compileID)->exec(); $this->dao->update(TABLE_JOB)