From 5f1b800a4206ed6ef695f98cfde32a21dcacfaae Mon Sep 17 00:00:00 2001 From: Yarmo Mackenbach Date: Sun, 28 Jan 2024 13:53:47 +0100 Subject: [PATCH] feat: get info about last git commit --- src/index.js | 19 +++++++++++++++++-- 1 file changed, 17 insertions(+), 2 deletions(-) diff --git a/src/index.js b/src/index.js index e49a099..893c7f2 100644 --- a/src/index.js +++ b/src/index.js @@ -31,6 +31,7 @@ import express from 'express' import * as httpContext from 'express-http-context2' import { nanoid } from 'nanoid' import { readFileSync } from 'fs' +import { execSync } from 'child_process'; import { stringReplace } from 'string-replace-middleware' import * as pug from 'pug' import * as dotenv from 'dotenv' @@ -43,6 +44,20 @@ import staticRoute from './routes/static.js' import utilRoute from './routes/util.js' dotenv.config() +// Get information about the last git commit +let gitBranch = process.env.CI_COMMIT_BRANCH ?? process.env.COMMIT_BRANCH +if (!gitBranch) { + try { + gitBranch = execSync('git rev-parse --abbrev-ref HEAD').toString().trim() + } catch (_) {} +} +let gitHash = process.env.CI_COMMIT_SHA ?? process.env.COMMIT_SHA +if (!gitHash) { + try { + gitHash = execSync('git rev-parse HEAD').toString().trim() + } catch (_) {} +} + const app = express() const packageData = JSON.parse(readFileSync('./package.json')) @@ -53,8 +68,8 @@ app.set('domain', process.env.DOMAIN) app.set('scheme', process.env.SCHEME || 'https') app.set('keyoxide_name', 'keyoxide-web') app.set('keyoxide_version', packageData.version) -app.set('git_branch', process.env.CI_COMMIT_BRANCH ?? process.env.COMMIT_BRANCH) -app.set('git_hash', process.env.CI_COMMIT_SHA ?? process.env.COMMIT_SHA) +app.set('git_branch', gitBranch) +app.set('git_hash', gitHash) app.set('onion_url', process.env.ONION_URL) // Middlewares