diff --git a/ExerciceChecker/src/config/Config.ts b/ExerciceChecker/src/config/Config.ts index 249315b33657da2d006760675b637a7ba5175a36..e50b50abb18c2eea92392bf01598328803a504fd 100644 --- a/ExerciceChecker/src/config/Config.ts +++ b/ExerciceChecker/src/config/Config.ts @@ -4,7 +4,7 @@ import path from 'path'; class Config { public readonly folders: { - project: string; resultsVolume: string; resultsDojo: string; resultsExercice: string; artifacts: string; + project: string; resultsVolume: string; resultsDojo: string; resultsExercice: string; }; public readonly exercice: { @@ -17,11 +17,10 @@ class Config { constructor() { this.folders = { - project : process.env.FILES_FOLDER || './', - resultsVolume : process.env.RESULTS_VOLUME || '', - resultsDojo : path.join(process.env.RESULTS_VOLUME || '', 'Dojo/'), - resultsExercice: path.join(process.env.RESULTS_VOLUME || '', 'Exercice/'), - artifacts : process.env.ARTIFACTS_FOLDER || '' + project : process.env.FILES_FOLDER?.convertWithEnvVars() ?? './', + resultsVolume : process.env.RESULTS_VOLUME?.convertWithEnvVars() ?? '', + resultsDojo : path.join(process.env.RESULTS_VOLUME?.convertWithEnvVars() ?? '', 'Dojo/'), + resultsExercice: path.join(process.env.RESULTS_VOLUME?.convertWithEnvVars() ?? '', 'Exercice/') }; this.resetResultsVolume(); diff --git a/ExerciceChecker/src/shared b/ExerciceChecker/src/shared index bfca2c401e4b5ff69b0a515fd9dcab49d36ee212..a026c4af16be3ae962b3031546ffac328e19fe50 160000 --- a/ExerciceChecker/src/shared +++ b/ExerciceChecker/src/shared @@ -1 +1 @@ -Subproject commit bfca2c401e4b5ff69b0a515fd9dcab49d36ee212 +Subproject commit a026c4af16be3ae962b3031546ffac328e19fe50