From 15f36263cde0a0a4e3068a1e68abc386ebadfc9d Mon Sep 17 00:00:00 2001 From: Sainan Date: Sun, 19 Jan 2025 12:28:45 +0100 Subject: [PATCH] chore: make buildConfig.json optional (#822) --- .github/workflows/build.yml | 1 - docker-entrypoint.sh | 6 ------ src/services/buildConfigService.ts | 18 +++++++++++++----- 3 files changed, 13 insertions(+), 12 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 3aa07742..ec5e2082 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -17,6 +17,5 @@ jobs: node-version: ${{ matrix.version }} - run: npm ci - run: cp config.json.example config.json - - run: echo '{"version":"","buildLabel":"","matchmakingBuildId":""}' > static/data/buildConfig.json - run: npm run build - run: npm run lint diff --git a/docker-entrypoint.sh b/docker-entrypoint.sh index bd942c82..9ec9086b 100755 --- a/docker-entrypoint.sh +++ b/docker-entrypoint.sh @@ -19,11 +19,5 @@ do mv config.tmp config.json done -if [ ! -f "/app/static/data/buildConfig.json" ] -then - echo "buildConfig not found, refusing to start." - exit 1 -fi - npm install exec npm run dev diff --git a/src/services/buildConfigService.ts b/src/services/buildConfigService.ts index f1653aff..dda9b909 100644 --- a/src/services/buildConfigService.ts +++ b/src/services/buildConfigService.ts @@ -1,13 +1,21 @@ import path from "path"; import fs from "fs"; -const rootDir = path.join(__dirname, "../.."); -const repoDir = path.basename(rootDir) == "build" ? path.join(rootDir, "..") : rootDir; -const buildConfigPath = path.join(repoDir, "static/data/buildConfig.json"); -export const buildConfig = JSON.parse(fs.readFileSync(buildConfigPath, "utf-8")) as IBuildConfig; - interface IBuildConfig { version: string; buildLabel: string; matchmakingBuildId: string; } + +export const buildConfig: IBuildConfig = { + version: "", + buildLabel: "", + matchmakingBuildId: "" +}; + +const rootDir = path.join(__dirname, "../.."); +const repoDir = path.basename(rootDir) == "build" ? path.join(rootDir, "..") : rootDir; +const buildConfigPath = path.join(repoDir, "static/data/buildConfig.json"); +if (fs.existsSync(buildConfigPath)) { + Object.assign(buildConfig, JSON.parse(fs.readFileSync(buildConfigPath, "utf-8")) as IBuildConfig); +}