diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index f927844c..51516a35 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -27,7 +27,7 @@ jobs: run: | npm i -g pnpm pnpm --prefix=./frontend i - UPSNAP_VERSION=${GITHUB_REF##*/} pnpm --prefix=./frontend run build + PUBLIC_VERSION=${GITHUB_REF##*/} pnpm --prefix=./frontend run build cp -r ./frontend/build/* ./backend/pb_public/ # setup go diff --git a/frontend/src/routes/settings/+page.svelte b/frontend/src/routes/settings/+page.svelte index d648245b..a2006b91 100644 --- a/frontend/src/routes/settings/+page.svelte +++ b/frontend/src/routes/settings/+page.svelte @@ -8,13 +8,13 @@ import { faSave } from '@fortawesome/free-solid-svg-icons'; import { onMount } from 'svelte'; import { page } from '$app/stores'; + import { PUBLIC_VERSION } from '$env/static/public'; import type { SettingsPublic, SettingsPrivate } from '$lib/types/settings'; let settingsPubClone: SettingsPublic | undefined; let settingsPrivClone: SettingsPrivate | undefined; let faviconPreview: HTMLImageElement; let faviconInputElement: HTMLInputElement; - let version = import.meta.env.UPSNAP_VERSION; onMount(() => { if (!$isAdmin) { @@ -185,12 +185,12 @@
- {#if version === undefined} + {#if PUBLIC_VERSION === undefined} UpSnap version: (untracked) {:else} UpSnap version: {version}{PUBLIC_VERSION} {/if}