better version detection

TheSharks · Nov 4, 2021 · ce8a6fa · ce8a6fa
1 parent 7feeecc
commit ce8a6fa
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -6,6 +6,8 @@ COPY tsconfig.json ./
 COPY package*.json ./
 COPY src ./src
 
+ENV GIT_COMMIT $(git rev-parse HEAD)
+
 RUN npm install
 RUN npm prune --production
 

diff --git a/src/entry.ts b/src/entry.ts
@@ -9,9 +9,11 @@ import dirImport from './utils/dir-import'
 info('Starting up...', 'Preflight');
 
 (async () => {
-  // eslint-disable-next-line @typescript-eslint/no-var-requires
-  const revision = (await promisify(exec)('git rev-parse HEAD').catch(() => { return { stdout: require('../package.json').version } })).stdout.toString().trim()
-  info(`Initialzing Sentry, using revision ${revision as string}`, 'Preflight')
+  const revision = process.env.GIT_COMMIT ??
+    (await promisify(exec)('git rev-parse HEAD').catch(() => ({ stdout: undefined }))).stdout?.toString().trim() ??
+    process.env.npm_package_version ??
+    'unknown'
+  info(`Initialzing Sentry, using revision ${revision}`, 'Preflight')
   Sentry.init({
     dsn: process.env.SENTRY_DSN,
     integrations: function (integrations) {