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

* Dealing with the default branch problem of Gitlab pipeline.

Browse Source
This commit is contained in:
caoyanyi
2023-11-07 17:03:09 +08:00
parent 69d096a46f
commit 8fb6642b97
1 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/job/model.php
+10 -2
View File
@@ -575,8 +575,16 @@ class jobModel extends model
{
$pipeline = json_decode($job->pipeline);
$pipelineParams = new stdclass;
$pipelineParams->ref = $pipeline->reference ? $pipeline->reference : 'master';
$pipelineParams = new stdclass;
$pipelineParams->ref = zget($pipeline, 'reference', '');
if(!$pipelineParams->ref)
{
$project = $this->loadModel('gitlab')->apiGetSingleProject($job->server, $pipeline->project, false);
$pipelineParams->ref = zget($project, 'default_branch', 'master');
$pipeline->reference = $pipelineParams->ref;
$this->dao->update(TABLE_JOB)->set('pipeline')->eq(json_encode($pipeline))->where('id')->eq($job->id)->exec();
}
$customParams = json_decode($job->customParam);
$variables = array();