Merge pull request #935 from frappe/mergify/bp/main/pr-930

fix: git command error (backport #930)
This commit is contained in:
Shariq Ansari 2025-06-16 12:43:07 +05:30 committed by GitHub
commit 2e1da1a627
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 0 additions and 38 deletions

View File

@ -45,7 +45,6 @@ def get_boot():
"user": frappe.db.get_value("User", frappe.session.user, "time_zone")
or get_system_timezone(),
},
"app_version": get_app_version(),
}
)
@ -54,25 +53,6 @@ def get_default_route():
return "/crm"
def get_app_version():
app = "crm"
branch = run_git_command(f"cd ../apps/{app} && git rev-parse --abbrev-ref HEAD")
commit = run_git_command(f"git -C ../apps/{app} rev-parse --short=7 HEAD")
tag = run_git_command(f"git -C ../apps/{app} describe --tags --abbrev=0")
dirty = run_git_command(f"git -C ../apps/{app} diff --quiet || echo 'dirty'") == "dirty"
commit_date = run_git_command(f"git -C ../apps/{app} log -1 --format=%cd")
commit_message = run_git_command(f"git -C ../apps/{app} log -1 --pretty=%B")
return {
"branch": branch,
"commit": commit,
"commit_date": commit_date,
"commit_message": commit_message,
"tag": tag,
"dirty": dirty,
}
def run_git_command(command):
try:
with open(os.devnull, "wb") as null_stream:

View File

@ -6,22 +6,6 @@
<div class="flex flex-col items-center">
<CRMLogo class="mb-3 size-12" />
<h3 class="font-semibold text-xl text-ink-gray-9">Frappe CRM</h3>
<div class="flex items-center mt-1">
<div class="text-base text-ink-gray-6">
{{ appVersion.branch != 'main' ? appVersion.branch : '' }}
<template v-if="appVersion.branch != 'main'">
({{ appVersion.commit }})
</template>
<template v-else>{{ appVersion.tag }}</template>
</div>
<Tooltip
:text="`${appVersion.commit_message} - ${appVersion.commit_date}`"
placement="top"
>
<LucideInfo class="size-3.5 text-ink-gray-8 ml-1" />
</Tooltip>
</div>
</div>
</div>
<hr class="border-t my-3 mx-2" />
@ -95,6 +79,4 @@ let links = [
icon: LucideHeadset,
},
]
let appVersion = window.app_version
</script>