bigbuffet/bigbuffet-rw
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Code: fix commit hash not appearing

Browse source
This commit is contained in:
Alex Gleason 2022-05-01 15:07:55 -05:00
parent 8ba9cef23d
commit 098ece132c
No known key found for this signature in database
GPG key ID: 7211D1F99744FBB7
1 changed files with 11 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
app/soapbox/utils/code.js
View file

@ -6,6 +6,14 @@ const pkg = require('../../../package.json');
const shortRepoName = url => new URL(url).pathname.substring(1); const shortRepoName = url => new URL(url).pathname.substring(1);
const trimHash = hash => hash.substring(0, 7); const trimHash = hash => hash.substring(0, 7);
const tryGit = cmd => {
try {
return String(execSync(cmd));
} catch (e) {
return null;
}
};
const version = pkg => { const version = pkg => {
// Try to discern from GitLab CI first // Try to discern from GitLab CI first
const { CI_COMMIT_TAG, CI_COMMIT_REF_NAME, CI_COMMIT_SHA } = process.env; const { CI_COMMIT_TAG, CI_COMMIT_REF_NAME, CI_COMMIT_SHA } = process.env;
@ -19,14 +27,10 @@ const version = pkg => {
} }
// Fall back to git directly // Fall back to git directly
try { const head = tryGit('git rev-parse HEAD');
const head = String(execSync('git rev-parse HEAD')); const tag = tryGit(`git rev-parse v${pkg.version}`);
const tag = String(execSync(`git rev-parse v${pkg.version}`));
if (head !== tag) return `${pkg.version}-${trimHash(head)}`; if (head && head !== tag) return `${pkg.version}-${trimHash(head)}`;
} catch (e) {
// Continue
}
// Fall back to version in package.json // Fall back to version in package.json
return pkg.version; return pkg.version;