diff --git a/src/routes/about/+page.svelte b/src/routes/about/+page.svelte index fdcb73b..f9c81cf 100644 --- a/src/routes/about/+page.svelte +++ b/src/routes/about/+page.svelte @@ -2,14 +2,14 @@ import { Heading, Img, P, A } from "flowbite-svelte"; // Get the git tag version from environment variables - const gitTagVersion = import.meta.env.GIT_TAG || 'development'; + const appVersion = import.meta.env.APP_VERSION || 'development';
- About - Version: {gitTagVersion} + About + Version: {appVersion}

diff --git a/vite.config.ts b/vite.config.ts index dfbb51a..5d73bc3 100644 --- a/vite.config.ts +++ b/vite.config.ts @@ -3,14 +3,20 @@ import { defineConfig } from "vite"; import { execSync } from "child_process"; // Function to get the latest git tag -function getLatestGitTag() { +function getAppVersionString() { + // if running in ci context, we can assume the package has been properly versioned + if (process.env.ALEXANDIRA_IS_CI_BUILD) { + return process.env.npm_package_version; + } + try { - // Get the latest git tag + // Get the latest git tag, assuming git is installed and tagged branch is available const tag = execSync('git describe --tags --abbrev=0').toString().trim(); return tag; } catch (error) { console.error("Failed to get git tag:", error); - return "unknown"; + // Fallback to package version + return process.env.npm_package_version; } } @@ -26,7 +32,7 @@ export default defineConfig({ include: ['./tests/unit/**/*.unit-test.js'] }, define: { - // Expose the git tag as a global variable - 'import.meta.env.GIT_TAG': JSON.stringify(getLatestGitTag()) + // Expose the app version as a global variable + 'import.meta.env.APP_VERSION': JSON.stringify(getAppVersionString()) } });