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

* [feedback#7498] adjust job status get logic.

Browse Source
This commit is contained in:
caoyanyi
2024-11-04 08:26:08 +08:00
committed by 刘刚
parent ccad01bfbb
commit 603f5b11e9
1 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/ci/model.php
+6 -5
View File
@@ -121,9 +121,9 @@ class ciModel extends model
}
else
{
$queueInfo = json_decode($response);
$queueInfo = @json_decode($response);
$buildInfo = null;
if(!empty($queueInfo->executable))
if($queueInfo && !empty($queueInfo->executable))
{
$buildUrl = $queueInfo->executable->url . 'api/json?pretty=true';
$response = common::http($buildUrl, '', array(CURLOPT_USERPWD => $userPWD));
@@ -131,9 +131,9 @@ class ciModel extends model
}
elseif(stripos($response, 'not found') !== false)
{
$job = strpos($compile->pipeline, '/job/') !== false ? $compile->pipeline : '/job/' . $compile->pipeline;
$buildUrl = "{$compile->url}{$job}/api/json?depth=1";
$response = json_decode(common::http($buildUrl, '', array(CURLOPT_USERPWD => $userPWD)));
$job = strpos($compile->pipeline, '/job/') !== false ? $compile->pipeline : '/job/' . $compile->pipeline;
$buildUrl = "{$compile->url}{$job}/api/json?depth=1";
$response = json_decode(common::http($buildUrl, '', array(CURLOPT_USERPWD => $userPWD)));
if($response)
{
foreach($response->builds as $build)
@@ -146,6 +146,7 @@ class ciModel extends model
}
}
}
if($buildInfo)
{
if(!empty($buildInfo->building))