Design/EasySoft-ZenTaoPMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 30 Wiki Activity

* Adjust trigger pipeline scheduled tasks.

Browse Source
This commit is contained in:
liyang
2024-03-28 14:31:56 +08:00
parent 6f485e7120
commit 043b1ab1bd
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/ci/control.php
+1 -1
View File
@@ -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);
}
module/compile/model.php
+2 -2
View File
@@ -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)