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

* Adjust pipeline check after api create mr.

Browse Source
This commit is contained in:
caoyanyi
2023-12-16 15:07:35 +08:00
parent 9c59a6edd8
commit bafa7ee76e
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/mr/model.php
+4 -3
View File
@@ -244,9 +244,10 @@ class mrModel extends model
{
if($MR->hasNoConflict == '0' && $MR->mergeStatus == 'can_be_merged' && $MR->jobID)
{
$extraParam = array('sourceBranch' => $MR->sourceBranch, 'targetBranch' => $MR->targetBranch);
$pipeline = $this->loadModel('job')->exec($MR->jobID, $extraParam);
$newMR = new stdClass();
$pipeline = $this->loadModel('job')->exec($MR->jobID, array('sourceBranch' => $MR->sourceBranch, 'targetBranch' => $MR->targetBranch));
if(!$pipeline) return false;
$newMR = new stdClass();
if(!empty($pipeline->queue))
{
$compile = $this->loadModel('compile')->getByQueue((int)$pipeline->queue);