Mirrors/elk
1
0
Fork 1
mirror of https://github.com/elk-zone/elk.git synced 2024-11-05 16:39:58 +00:00
Code Issues Wiki Activity

fix: git branch name (#771)

Browse source
This commit is contained in:
三咲智子 Kevin Deng 2023-01-04 21:41:48 +08:00 committed by GitHub
parent 8a66174477
commit 9a167ee990
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 11 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
config/env.ts
View file

@ -11,6 +11,14 @@ export { version } from '../package.json'
*/
export const isPR = process.env.PULL_REQUEST === 'true'
/**
* Environment variable `BRANCH` provided by Netlify.
* @see {@link https://docs.netlify.com/configure-builds/environment-variables/#git-metadata}
*
* Git branch
*/
export const gitBranch = process.env.BRANCH
/**
* Environment variable `CONTEXT` provided by Netlify.
* @see {@link https://docs.netlify.com/configure-builds/environment-variables/#build-metadata}
@ -21,7 +29,7 @@ export const isPreview = isPR || process.env.CONTEXT === 'deploy-preview' || pro
const git = Git()
export const getGitInfo = async () => {
const branch = await git.revparse(['--abbrev-ref', 'HEAD'])
const branch = gitBranch || await git.revparse(['--abbrev-ref', 'HEAD'])
const commit = await git.revparse(['HEAD'])
return { branch, commit }
}

2
config/pwa.ts
View file

@ -15,7 +15,7 @@ export const pwa: VitePWANuxtOptions = {
includeManifestIcons: false,
manifest: async () => {
const { env } = await getEnv()
const envName = `${env !== 'release' ? '' : ` (${env})`}`
const envName = `${env === 'release' ? '' : ` (${env})`}`
return {
scope: '/',
id: '/',

2
pages/settings/about/index.vue
View file

@ -36,7 +36,7 @@ const handleShowCommit = () => {
<template #content>
<div font-mono>
<span>{{ buildInfo.env === 'release' ? `v${buildInfo.version}` : buildInfo.env }}</span>
<span v-if="showCommit"> ({{ buildInfo.commit.slice(0, 7) }})</span>
<span v-if="showCommit"> ({{ buildInfo.commit.slice(0, 7) }}@{{ buildInfo.branch }})</span>
</div>
</template>
</SettingsItem>