Merge branch 'fix/v1.3.1-version-badge' into 'main'
fix(version): bump to 1.3.1 and show 8-char commit hash See merge request 2-6/2-6-4/terravault/ordinis!44
This commit is contained in:
@@ -1,7 +1,7 @@
|
||||
{
|
||||
"name": "ordinis-admin-ui",
|
||||
"private": true,
|
||||
"version": "1.2.0",
|
||||
"version": "1.3.1",
|
||||
"type": "module",
|
||||
"scripts": {
|
||||
"dev": "vite",
|
||||
|
||||
@@ -42,7 +42,7 @@ export function VersionBadge() {
|
||||
serverTag только при tag build'е — на branch builds показываем clientVersion. */}
|
||||
<span>{serverTag && serverTag !== 'none' ? serverTag : `v${clientVersion}`}</span>
|
||||
<span className="text-mute/70">·</span>
|
||||
<span>{(serverCommit || clientCommit).substring(0, 7)}</span>
|
||||
<span>{(serverCommit || clientCommit).substring(0, 8)}</span>
|
||||
</span>
|
||||
)
|
||||
}
|
||||
|
||||
@@ -20,7 +20,7 @@ const APP_COMMIT: string =
|
||||
process.env.CI_COMMIT_SHORT_SHA ??
|
||||
(() => {
|
||||
try {
|
||||
return execSync('git rev-parse --short HEAD', { stdio: ['ignore', 'pipe', 'ignore'] })
|
||||
return execSync('git rev-parse --short=8 HEAD', { stdio: ['ignore', 'pipe', 'ignore'] })
|
||||
.toString()
|
||||
.trim()
|
||||
} catch {
|
||||
|
||||
Reference in New Issue
Block a user