From e3d238f897f98ffc67d921988dfbfbad6ce0cdc3 Mon Sep 17 00:00:00 2001 From: KernelDeimos Date: Thu, 11 Apr 2024 13:57:29 -0400 Subject: [PATCH] Do not use git to get version number --- packages/backend/package.json | 2 +- .../backend/src/services/PuterVersionService.js | 14 +++----------- 2 files changed, 4 insertions(+), 12 deletions(-) diff --git a/packages/backend/package.json b/packages/backend/package.json index eb18aa61b..320bd2d58 100644 --- a/packages/backend/package.json +++ b/packages/backend/package.json @@ -1,6 +1,6 @@ { "name": "@heyputer/backend", - "version": "1.0.0", + "version": "2.0.2", "description": "Backend/Kernel for Puter", "main": "exports.js", "scripts": { diff --git a/packages/backend/src/services/PuterVersionService.js b/packages/backend/src/services/PuterVersionService.js index 165812a16..3977902d3 100644 --- a/packages/backend/src/services/PuterVersionService.js +++ b/packages/backend/src/services/PuterVersionService.js @@ -60,27 +60,19 @@ class PuterVersionService extends AdvancedBase { } get_version () { - let git_version; let deploy_timestamp; if ( this.config.env === 'dev' ) { - // get commit hash from git - git_version = this.modules._exec('git describe --tags', { - cwd: this.modules._path.join(__dirname, '../../'), - encoding: 'utf8', - }).trim(); deploy_timestamp = Date.now(); } else { - // get git version from file - const path = this.modules._path.join(__dirname, '../../git_version'); - - git_version = this.modules.fs.readFileSync(path, 'utf8').trim(); deploy_timestamp = Number.parseInt((this.modules.fs.readFileSync( this.modules._path.join(__dirname, '../../deploy_timestamp'), 'utf8' )).trim()); } + const version = process.env.npm_package_version || + require('../../package.json').version; return { - version: git_version, + version, environment: this.config.env, location: this.config.server_id, deploy_timestamp,