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

* Merge 18 devopos to 20

Browse Source
This commit is contained in:
zenggang
2023-10-07 03:03:28 +00:00
parent 4e535ae301
commit 10a61396a1
196 changed files with 3646 additions and 940 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/git/model.php
+10 -2
View File
@@ -69,6 +69,8 @@ class gitModel extends model
/* Get repos and load module. */
$this->setRepos();
$this->loadModel('job');
$this->loadModel('gitlab');
$this->loadModel('repo');
if(empty($this->repos)) return false;
@@ -82,7 +84,11 @@ class gitModel extends model
{
$this->updateCommit($repo, $commentGroup, true);
if($repo->SCM == 'Gitlab') $this->loadModel('gitlab')->updateCodePath((int)$repo->serviceHost, (int)$repo->serviceProject, (int)$repo->id);
if($repo->SCM == 'Gitlab')
{
$this->gitlab->updateCodePath((int)$repo->serviceHost, (int)$repo->serviceProject, (int)$repo->id);
$this->repo->updateCommitDate((int)$repo->id);
}
/* Create compile by tag. */
$jobs = zget($tagGroup, $repoID, array());
@@ -120,6 +126,8 @@ class gitModel extends model
*/
public function updateCommit($repo, $commentGroup, $printLog = true)
{
if($repo->SCM == 'Gitlab') return;
/* Load module and print log. */
$this->loadModel('repo');
if($printLog) $this->printLog("begin repo $repo->id");
@@ -202,7 +210,7 @@ class gitModel extends model
if(empty($objectIDs) or !isset($objectTypeMap[$objectType])) continue;
$this->post->$objectType = $objectIDs;
$this->repo->link($repo->id, $log->revision, $objectTypeMap[$objectType]);
$this->repo->link($repo->id, $log->revision, $objectTypeMap[$objectType], 'commit');
}
}
}