More version information in settings.

This commit is contained in:
Paul 2021-06-22 19:45:44 +01:00
parent 29bb93f399
commit 8845900779
3 changed files with 23 additions and 3 deletions

View file

@ -20,7 +20,7 @@ import {
User User
} from "@styled-icons/feather"; } from "@styled-icons/feather";
import { Megaphone } from "@styled-icons/bootstrap"; import { Megaphone } from "@styled-icons/bootstrap";
import { GIT_REVISION, REPO_URL } from "../../revision"; import { GIT_BRANCH, GIT_REVISION, REPO_URL } from "../../revision";
import LineDivider from "../../components/ui/LineDivider"; import LineDivider from "../../components/ui/LineDivider";
import RequiresOnline from "../../context/revoltjs/RequiresOnline"; import RequiresOnline from "../../context/revoltjs/RequiresOnline";
import ButtonItem from "../../components/navigation/items/ButtonItem"; import ButtonItem from "../../components/navigation/items/ButtonItem";
@ -147,8 +147,12 @@ export default function Settings() {
<a href={`${REPO_URL}/${GIT_REVISION}`} target="_blank"> <a href={`${REPO_URL}/${GIT_REVISION}`} target="_blank">
{ GIT_REVISION.substr(0, 7) } { GIT_REVISION.substr(0, 7) }
</a> </a>
{` `}
<a href={GIT_BRANCH !== 'DETACHED' ? `https://gitlab.insrt.uk/revolt/client/-/tree/${GIT_BRANCH}` : undefined} target="_blank">
({ GIT_BRANCH })
</a>
</span> </span>
<span>Stable {APP_VERSION}</span> <span>{ GIT_BRANCH === 'production' ? 'Stable' : 'Nightly' } {APP_VERSION}</span>
<span>API: {client.configuration?.revolt ?? "N/A"}</span> <span>API: {client.configuration?.revolt ?? "N/A"}</span>
<span>revolt.js: {LIBRARY_VERSION}</span> <span>revolt.js: {LIBRARY_VERSION}</span>
</div> </div>

View file

@ -1,2 +1,3 @@
export const GIT_REVISION = '__GIT_REVISION__';
export const REPO_URL = 'https://gitlab.insrt.uk/revolt/revite/-/commit'; export const REPO_URL = 'https://gitlab.insrt.uk/revolt/revite/-/commit';
export const GIT_REVISION = '__GIT_REVISION__';
export const GIT_BRANCH: string = '__GIT_BRANCH__';

View file

@ -19,6 +19,20 @@ function getGitRevision() {
} }
} }
function getGitBranch() {
try {
const rev = readFileSync('.git/HEAD').toString().trim();
if (rev.indexOf(':') === -1) {
return 'DETACHED';
} else {
return rev.split('/').pop();
}
} catch (err) {
console.error('Failed to get Git branch.');
return '?';
}
}
function getVersion() { function getVersion() {
return readFileSync('VERSION').toString(); return readFileSync('VERSION').toString();
} }
@ -55,6 +69,7 @@ export default defineConfig({
}), }),
replace({ replace({
__GIT_REVISION__: getGitRevision(), __GIT_REVISION__: getGitRevision(),
__GIT_BRANCH__: getGitBranch(),
__APP_VERSION__: getVersion(), __APP_VERSION__: getVersion(),
preventAssignment: true preventAssignment: true
}) })