valvin
/
ttrss
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

move branch to version tooltip

This commit is contained in:
Andrew Dolgov 2023-04-10 20:04:38 +03:00
parent 15c9dbe270
commit 27bd226f2b
No known key found for this signature in database
GPG Key ID: 1A56B4FA25D4AF2A
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
classes/config.php
View File

@ -311,7 +311,11 @@ class Config {
static function get_version_html() : string { static function get_version_html() : string {
$version = self::get_version(false); $version = self::get_version(false);
return sprintf("<span title=\"%s\n%s\">%s</span>", date("Y-m-d H:i:s", ($version['timestamp'] ?? 0)), $version['commit'], $version['version']); return sprintf("<span title=\"%s\n%s\n%s\">%s</span>",
date("Y-m-d H:i:s", ($version['timestamp'] ?? 0)),
$version['commit'],
$version['branch'] ?? '',
$version['version']);
} }
/** /**
@ -325,7 +329,8 @@ class Config {
if (getenv("BUILD_TIMESTAMP") && getenv("CI_COMMIT_SHORT_SHA")) { if (getenv("BUILD_TIMESTAMP") && getenv("CI_COMMIT_SHORT_SHA")) {
$this->version["version"] = sprintf("%s-%s-%s", getenv("BUILD_TIMESTAMP"), getenv("CI_COMMIT_BRANCH"), getenv("CI_COMMIT_SHORT_SHA")); $this->version["version"] = sprintf("%s-%s", getenv("BUILD_TIMESTAMP"), getenv("CI_COMMIT_SHORT_SHA"));
$this->version["branch"] = getenv("CI_COMMIT_BRANCH");
$this->version["timestamp"] = strtotime(getenv("CI_COMMIT_TIMESTAMP")); $this->version["timestamp"] = strtotime(getenv("CI_COMMIT_TIMESTAMP"));
$this->version["commit"] = getenv("CI_COMMIT_SHORT_SHA"); $this->version["commit"] = getenv("CI_COMMIT_SHORT_SHA");
$this->version["status"] = 0; $this->version["status"] = 0;
@ -367,6 +372,7 @@ class Config {
$rv = [ $rv = [
"status" => -1, "status" => -1,
"version" => "", "version" => "",
"branch" => "",
"commit" => "", "commit" => "",
"timestamp" => 0, "timestamp" => 0,
]; ];