misty.cafe/mistykey
1
0
Fork 0
Code Issues Pull requests 1 Projects Releases Packages Wiki Activity Actions

merge: embed git commit info in nodeinfo&c (!1144)

Browse source 
View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/1144

Approved-by: Hazelnoot <acomputerdog@gmail.com>
Approved-by: Marie <github@yuugi.dev>
This commit is contained in:
Hazelnoot 2025-07-27 15:30:31 +00:00
commit 3cffd4a537
4 changed files with 16 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

4
packages/backend/src/boot/master.ts
View file

@ -51,7 +51,7 @@ function greet() {
} }
bootLogger.info('Welcome to Sharkey!'); bootLogger.info('Welcome to Sharkey!');
bootLogger.info(`Sharkey v${meta.version}`, null, true); bootLogger.info(`Sharkey v${meta.gitVersion ?? meta.version}`, null, true);
} }
/** /**
@ -91,7 +91,7 @@ export async function masterMain() {
maxBreadcrumbs: 0, maxBreadcrumbs: 0,
// Set release version // Set release version
release: 'Sharkey@' + meta.version, release: 'Sharkey@' + (meta.gitVersion ?? meta.version),
...config.sentryForBackend.options, ...config.sentryForBackend.options,
}); });

2
packages/backend/src/boot/worker.ts
View file

@ -37,7 +37,7 @@ export async function workerMain() {
maxBreadcrumbs: 0, maxBreadcrumbs: 0,
// Set release version // Set release version
release: "Sharkey@" + meta.version, release: "Sharkey@" + (meta.gitVersion ?? meta.version),
...config.sentryForBackend.options, ...config.sentryForBackend.options,
}); });

2
packages/backend/src/config.ts
View file

@ -401,7 +401,7 @@ export function loadConfig(): Config {
applyEnvOverrides(config); applyEnvOverrides(config);
const url = tryCreateUrl(config.url ?? process.env.MISSKEY_URL ?? ''); const url = tryCreateUrl(config.url ?? process.env.MISSKEY_URL ?? '');
const version = meta.version; const version = meta.gitVersion ?? meta.version;
const host = url.host; const host = url.host;
const hostname = url.hostname; const hostname = url.hostname;
const scheme = url.protocol.replace(/:$/, ''); const scheme = url.protocol.replace(/:$/, '');

13
scripts/build-pre.js
View file

@ -5,13 +5,24 @@
const fs = require('fs'); const fs = require('fs');
const packageJsonPath = __dirname + '/../package.json' const packageJsonPath = __dirname + '/../package.json'
const { execFileSync } = require('node:child_process');
function build() { function build() {
let gitVersion;
try {
gitVersion = execFileSync('git', ['describe', '--tags'], {
encoding: 'utf-8',
});
gitVersion = gitVersion.trim();
} catch (e) {
console.warn("couldn't get git commit details, ignoring",e);
}
try { try {
const json = fs.readFileSync(packageJsonPath, 'utf-8') const json = fs.readFileSync(packageJsonPath, 'utf-8')
const meta = JSON.parse(json); const meta = JSON.parse(json);
fs.mkdirSync(__dirname + '/../built', { recursive: true }); fs.mkdirSync(__dirname + '/../built', { recursive: true });
fs.writeFileSync(__dirname + '/../built/meta.json', JSON.stringify({ version: meta.version }), 'utf-8'); fs.writeFileSync(__dirname + '/../built/meta.json', JSON.stringify({ version: meta.version, gitVersion }), 'utf-8');
} catch (e) { } catch (e) {
console.error(e) console.error(e)
} }