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

* Display and reformat job log.

Browse Source
This commit is contained in:
dingguodong
2021-07-28 10:33:46 +08:00
parent 000090ba96
commit ca8a8229bf
1 changed files with 23 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/ci/model.php
+23 -2
View File
@@ -137,13 +137,34 @@ class ciModel extends model
foreach($jobs as $job)
{
if(empty($job->duration) or $job->duration == '') $job->duration = '-';
$log .= "Name: $job->name, Stage: $job->stage, Status: $job->status, Duration: $job->duration \r\n Web URL: $job->web_url \r\n";
$log .= $this->loadModel('gitlab')->apiGetJobLog($compile->server, $compile->pipeline, $job->id) . "\r\n\r\n\r\n";
$log .= "<font style='font-weight:bold'>&gt;&gt;&gt; Name: $job->name, Stage: $job->stage, Status: $job->status, Duration: $job->duration \r\n </font>";
$log .= "Web URL: <a href=\"$job->web_url\" target='_blank'>$job->web_url</a> \r\n";
$log .= $this->transformAnsiToHtml($this->loadModel('gitlab')->apiGetJobLog($compile->server, $compile->pipeline, $job->id));
}
$this->dao->update(TABLE_COMPILE)->set('status')->eq($pipeline->status)->set('updateDate')->eq($now)->set('logs')->eq($log)->where('id')->eq($compile->id)->exec();
$this->dao->update(TABLE_JOB)->set('lastExec')->eq($now)->set('lastStatus')->eq($pipeline->status)->where('id')->eq($compile->job)->exec();
}
/**
* Transform ansi text to html.
*
* @param string $text
* @access public
* @return string
*/
public function transformAnsiToHtml($text)
{
$text = preg_replace("/\x1B\[31;40m/", '<font style="color: red">', $text);
$text = preg_replace("/\x1B\[32;1m/", '<font style="color: green">', $text);
$text = preg_replace("/\x1B\[32;1m/", '<font style="color: green">', $text);
$text = preg_replace("/\x1B\[36;1m/", '<font style="color: cyan">', $text);
$text = preg_replace("/\x1B\[0;33m/", '<font style="color: yellow">', $text);
$text = preg_replace("/\x1B\[1m/", '<font style="font-weight:bold">', $text);
$text = preg_replace("/\x1B\[0;m/", '</font><br>', $text);
$text = preg_replace("/\x1B\[0K/", '<br>', $text);
return $text;
}
/**
* Update ci build status.
*