From b41a0a9127279ee9ebf5a5b73dac725a25364d4b Mon Sep 17 00:00:00 2001 From: alekswilc Date: Sun, 27 Apr 2025 15:24:09 +0200 Subject: [PATCH] build(): test new build sys --- .drone.yml | 13 +++++++++-- packages/backend/Dockerfile | 7 +++++- packages/backend/package.json | 3 ++- packages/backend/src/util/git.ts | 22 +++---------------- packages/backend/tsconfig.json | 2 +- .../src/components/pages/profiles/Profile.tsx | 4 ++-- 6 files changed, 25 insertions(+), 26 deletions(-) diff --git a/.drone.yml b/.drone.yml index b15506e..fe7c603 100644 --- a/.drone.yml +++ b/.drone.yml @@ -6,14 +6,23 @@ name: build steps: - name: build-backend image: plugins/docker + environment: + TAG: + ${DRONE_TAG} + COMMIT: + ${DRONE_COMMIT} settings: insecure: true repo: 10.5.0.103:1222/simrail-backend registry: 10.5.0.103:1222 context: './packages/backend' dockerfile: './packages/backend/Dockerfile' + build_args_from_env: + - TAG + - COMMIT tags: - latest + - ${DRONE_TAG} - name: build-frontend image: plugins/docker @@ -33,7 +42,7 @@ steps: - VITE_STATS_KEY tags: - latest + - ${DRONE_TAG##v} trigger: - branch: - - main + - tag \ No newline at end of file diff --git a/packages/backend/Dockerfile b/packages/backend/Dockerfile index d2b6668..c524a32 100644 --- a/packages/backend/Dockerfile +++ b/packages/backend/Dockerfile @@ -6,8 +6,13 @@ COPY . . RUN yarn add -D typescript RUN yarn rawbuild -RUN ls +ARG COMMIT +ENV COMMIT $COMMIT +ARG TAG +ENV TAG $TAG + +RUN yarn make-git-info # Install Doppler CLI RUN wget -q -t3 'https://packages.doppler.com/public/cli/rsa.8004D9FF50437357.key' -O /etc/apk/keys/cli@doppler-8004D9FF50437357.rsa.pub && \ diff --git a/packages/backend/package.json b/packages/backend/package.json index 5bcad5e..d554ab5 100644 --- a/packages/backend/package.json +++ b/packages/backend/package.json @@ -6,7 +6,8 @@ "scripts": { "build": "docker build --progress=plain -t simrailpro:backend .", "rawbuild": "yarn tsc", - "start": "yarn rawbuild && node --env-file=.env dist/index.js" + "start": "yarn rawbuild && node --env-file=.env dist/index.js", + "make-git-info": "node scripts/make-git.js" }, "author": "Aleksander Wilczyński", "license": "AGPL-3.0-only", diff --git a/packages/backend/src/util/git.ts b/packages/backend/src/util/git.ts index 07267d3..aa65e2e 100644 --- a/packages/backend/src/util/git.ts +++ b/packages/backend/src/util/git.ts @@ -14,7 +14,7 @@ * See LICENSE for more. */ -import { execSync } from "child_process"; +import gitInfo from '../../git.json' with { type: "json" }; export class GitUtil { @@ -22,28 +22,12 @@ export class GitUtil private static getLatestVersion() { - return process.env.CURRENT_VERSION; - // try - // { - // const data = execSync("git describe --tags --exact-match").toString(); - // return data.replace("\n", ""); - // } catch - // { - // return undefined; - // } + return gitInfo.tag; } private static getLatestCommit() { - return process.env.CURRENT_COMMIT; - // try - // { - // const data = execSync("git rev-parse --short HEAD").toString(); - // return data.replace("\n", ""); - // } catch - // { - // return undefined; - // } + return gitInfo.commit; } diff --git a/packages/backend/tsconfig.json b/packages/backend/tsconfig.json index 92a305d..938225c 100644 --- a/packages/backend/tsconfig.json +++ b/packages/backend/tsconfig.json @@ -39,7 +39,7 @@ // "resolvePackageJsonExports": true, /* Use the package.json 'exports' field when resolving package imports. */ // "resolvePackageJsonImports": true, /* Use the package.json 'imports' field when resolving imports. */ // "customConditions": [], /* Conditions to set in addition to the resolver-specific defaults when resolving imports. */ - // "resolveJsonModule": true, /* Enable importing .json files. */ + "resolveJsonModule": true, /* Enable importing .json files. */ // "allowArbitraryExtensions": true, /* Enable importing files with any extension, provided a declaration file is present. */ // "noResolve": true, /* Disallow 'import's, 'require's or ''s from expanding the number of files TypeScript should add to a project. */ diff --git a/packages/frontend/src/components/pages/profiles/Profile.tsx b/packages/frontend/src/components/pages/profiles/Profile.tsx index ae80f81..ee5d0e7 100644 --- a/packages/frontend/src/components/pages/profiles/Profile.tsx +++ b/packages/frontend/src/components/pages/profiles/Profile.tsx @@ -169,7 +169,7 @@ export const ProfileCard = ({ data, images }: { data: TProfileData, images: TIma {dispatcherStats[dispatcherPage - 1].map(stationName => { const station = data.player.dispatcherStats[stationName]; - return + return })}
@@ -194,7 +194,7 @@ export const ProfileCard = ({ data, images }: { data: TProfileData, images: TIma
{trainStats[trainPage - 1].map(trainName => { const train = data.player.trainStats[trainName]; - return + return })}