ivan-igorevich/mdm-ordinis
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'fix/ci-detection-via-short-sha' into 'main'

Browse Source 
fix(version): CI detect via CI_COMMIT_SHORT_SHA

See merge request 2-6/2-6-4/terravault/ordinis!55
This commit is contained in:
Александр Зимин
2026-05-11 12:30:06 +00:00
parent 24e621ced4 b6af155da2
commit 706c31b2d7
1 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ordinis-admin-ui/vite.config.ts
+6 -4
View File
@@ -28,10 +28,12 @@ const APP_VERSION: string = JSON.parse(
// --build-arg GIT_TAG="${CI_COMMIT_TAG:-none}"). Filter → пустая строка. // --build-arg GIT_TAG="${CI_COMMIT_TAG:-none}"). Filter → пустая строка.
const RAW_TAG = process.env.CI_COMMIT_TAG ?? '' const RAW_TAG = process.env.CI_COMMIT_TAG ?? ''
const APP_TAG: string = RAW_TAG === 'none' ? '' : RAW_TAG.replace(/^v/, '') const APP_TAG: string = RAW_TAG === 'none' ? '' : RAW_TAG.replace(/^v/, '')
// GitLab CI ставит CI=true. Используем для discriminate "CI branch build" // Distinguish "CI branch build" (badge → 'dev') vs "local pnpm dev" (→ 'local').
// (нет tag'а, но есть pipeline) vs "local pnpm dev" (нет ни того ни другого). // Canonical CI signal — наличие CI_COMMIT_SHORT_SHA (GitLab CI always sets).
// VersionBadge показывает 'dev' для первого, 'local' для второго. // process.env.CI тоже check'аем но он НЕ пробрасывается через Docker ARG'и
const APP_CI: boolean = process.env.CI === 'true' // (см. ordinis-admin-ui/Dockerfile), поэтому SHORT_SHA — primary detect.
const APP_CI: boolean =
Boolean(process.env.CI_COMMIT_SHORT_SHA) || process.env.CI === 'true'
const APP_COMMIT: string = const APP_COMMIT: string =
process.env.CI_COMMIT_SHORT_SHA ?? process.env.CI_COMMIT_SHORT_SHA ??
(() => { (() => {