From 6afdea6bd42e6e2a84d15ed13a2edf9cb13975ea Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C3=ABl=20Minelli?= <michael@minelli.me>
Date: Thu, 18 Jan 2024 16:56:07 +0100
Subject: [PATCH] CI/CD => Restore version replacement from pipeline
---
ExerciseChecker/.gitlab-ci/01_functions.yml | 2 +-
ExerciseChecker/src/app.ts | 3 +--
2 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/ExerciseChecker/.gitlab-ci/01_functions.yml b/ExerciseChecker/.gitlab-ci/01_functions.yml
index 631e831..ca24e69 100644
--- a/ExerciseChecker/.gitlab-ci/01_functions.yml
+++ b/ExerciseChecker/.gitlab-ci/01_functions.yml
@@ -51,7 +51,7 @@
# Decrypt env vars for production
- apk add npm sed
- cd $PROJECT_FOLDER
- #- sed -i -r "s/\{\{VERSION\}\}/${VERSION}/g" src/app.ts # Not needed anymore
+ - sed -i -r "s/\{\{VERSION\}\}/${VERSION}/g" src/app.ts # Needed for have the -dev ou -test suffix in the version
- |
if [[ $CI_COMMIT_REF_PROTECTED == "true" || $IS_TEST == true ]]; then
echo "Decrypt production env vars"
diff --git a/ExerciseChecker/src/app.ts b/ExerciseChecker/src/app.ts
index 791025b..2a519e8 100644
--- a/ExerciseChecker/src/app.ts
+++ b/ExerciseChecker/src/app.ts
@@ -28,13 +28,12 @@ import ExerciseResultsSanitizerAndValidator from './sharedByClients/helpers/Dojo
import ExerciseAssignment from './sharedByClients/models/ExerciseAssignment';
import ClientsSharedExerciseHelper from './sharedByClients/helpers/Dojo/ClientsSharedExerciseHelper';
import Icon from './shared/types/Icon';
-import { version } from './config/Version';
(async () => {
HttpManager.registerAxiosInterceptor();
- console.log(Styles.APP_NAME(`${ Config.appName } (version ${ version })`));
+ console.log(Styles.APP_NAME(`${ Config.appName } (version {{VERSION}})`));
let exerciseAssignment: ExerciseAssignment | undefined;
let exerciseDockerCompose: ExerciseDockerCompose;
--
GitLab