tilderadio
/
AzuraCast
mirror of https://github.com/AzuraCast/AzuraCast.git
4
0
Fork 0
Code Issues Releases Wiki Activity

Bug fixes.

This commit is contained in:
Buster Neece 2023-02-03 15:01:50 -06:00
parent 29e61188fe
commit 4205eeae09
No known key found for this signature in database
GPG Key ID: F1D2E64A0005E80E
2 changed files with 2 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/Version.php
View File

@ -80,9 +80,7 @@ final class Version
$details['commit_date'] = 'N/A';
}
if (empty($details['tag'])) {
$details['tag'] = self::FALLBACK_VERSION;
}
$details['tag'] = self::FALLBACK_VERSION;
$ttl = $this->environment->isProduction() ? 86400 : 600;
@ -108,7 +106,6 @@ final class Version
return [
'commit' => $gitInfo['COMMIT_LONG'] ?? null,
'commit_date_raw' => $gitInfo['COMMIT_DATE'] ?? null,
'tag' => $gitInfo['TAG'] ?? null,
'branch' => $gitInfo['BRANCH'] ?? null,
];
} catch (\Throwable) {
@ -118,14 +115,9 @@ final class Version
}
if (is_dir($this->repoDir . '/.git')) {
$last_tagged_commit = $this->runProcess(['git', 'rev-list', '--tags', '--max-count=1']);
return [
'commit' => $this->runProcess(['git', 'log', '--pretty=%H', '-n1', 'HEAD']),
'commit_date_raw' => $this->runProcess(['git', 'log', '-n1', '--pretty=%ci', 'HEAD']),
'tag' => (!empty($last_tagged_commit))
? $this->runProcess(['git', 'describe', '--tags', $last_tagged_commit], 'N/A')
: null,
'branch' => $this->runProcess(['git', 'rev-parse', '--abbrev-ref', 'HEAD'], 'main'),
];
}

6
util/write_git_info.sh
View File

@ -8,12 +8,8 @@ cd ..
COMMIT_LONG=$(git log --pretty=%H -n1 HEAD)
COMMIT_DATE=$(git log -n1 --pretty=%ci HEAD)
LAST_TAG_HASH=$(git rev-list --tags --max-count=1)
LAST_TAG=$(git describe --tags $LAST_TAG_HASH)
BRANCH=$(git rev-parse --abbrev-ref HEAD main | head -n 1)
BRANCH=$(git rev-parse --abbrev-ref HEAD | head -n 1)
printf "COMMIT_LONG=\"%s\"\n" "$COMMIT_LONG" > .gitinfo
printf "COMMIT_DATE=\"%s\"\n" "$COMMIT_DATE" >> .gitinfo
printf "LAST_TAG=\"%s\"\n" "$LAST_TAG" >> .gitinfo
printf "BRANCH=\"%s\"\n" "$BRANCH" >> .gitinfo