From 0065851254353f7830d6180af1878b81b988d5c9 Mon Sep 17 00:00:00 2001 From: iCrawl Date: Wed, 11 Sep 2019 02:50:34 +0200 Subject: [PATCH] chore: remove set_version --- Dockerfile | 1 + package.json | 1 - set_version.js | 11 ----------- src/bot/client/HarunaClient.ts | 3 +-- src/bot/commands/util/stats.ts | 4 +--- 5 files changed, 3 insertions(+), 17 deletions(-) delete mode 100644 set_version.js diff --git a/Dockerfile b/Dockerfile index 49dc1c3a..2ecdea61 100644 --- a/Dockerfile +++ b/Dockerfile @@ -25,5 +25,6 @@ ENV NODE_ENV= \ DB= \ REDIS= \ SENTRY= +ENV VERSION= CMD ["node", "dist/haruna.js"] diff --git a/package.json b/package.json index 704ad2b5..57f5c513 100644 --- a/package.json +++ b/package.json @@ -7,7 +7,6 @@ "license": "UNLICENSED", "private": true, "scripts": { - "set_version": "node set_version.js", "prebuild": "yarn lint", "build": "rimraf dist && tsc", "lint": "eslint src --ext .ts" diff --git a/set_version.js b/set_version.js deleted file mode 100644 index d57e2403..00000000 --- a/set_version.js +++ /dev/null @@ -1,11 +0,0 @@ -const { writeFileSync } = require('fs'); -const { join } = require('path'); - -module.exports = (() => { - const rev = require('child_process') - .execSync('git rev-parse HEAD') - .toString() - .trim(); - const line = `export const VERSION = '${rev}';\n`; - writeFileSync(join(__dirname, 'src', 'util', 'version.ts'), line); -})(); diff --git a/src/bot/client/HarunaClient.ts b/src/bot/client/HarunaClient.ts index 36a6e406..4d5cea8f 100644 --- a/src/bot/client/HarunaClient.ts +++ b/src/bot/client/HarunaClient.ts @@ -15,7 +15,6 @@ import { Counter, register } from 'prom-client'; import { createServer, Server } from 'http'; import { parse } from 'url'; import { init } from '@sentry/node'; -import { VERSION } from '../../util/version'; declare module 'discord-akairo' { interface AkairoClient { @@ -193,7 +192,7 @@ export default class HarunaClient extends AkairoClient { init({ dsn: process.env.SENTRY, environment: process.env.NODE_ENV, - release: VERSION + release: process.env.VERSION! }); } else { process.on('unhandledRejection', (err: any): Logger => this.logger.error(`[UNHANDLED REJECTION] ${err.message}`, err.stack)); diff --git a/src/bot/commands/util/stats.ts b/src/bot/commands/util/stats.ts index 32ebff8d..51a6478a 100644 --- a/src/bot/commands/util/stats.ts +++ b/src/bot/commands/util/stats.ts @@ -4,8 +4,6 @@ import { stripIndents } from 'common-tags'; import * as moment from 'moment'; import 'moment-duration-format'; -const { version } = require('../../../../package.json'); // eslint-disable-line - export default class StatsCommand extends Command { public constructor() { super('stats', { @@ -33,7 +31,7 @@ export default class StatsCommand extends Command { `, true ) - .addField('❯ Version', `v${version}`, true) + .addField('❯ Version', `[${process.env.VERSION!}](https://github.com/Naval-Base/haruna/commit/${process.env.VERSION!})`, true) .addField('❯ Source Code', '[View Here](https://github.com/Naval-Base/haruna)', true) .addField( '❯ Library',