@soft-artel/ci 1.4.37 → 1.4.40
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/k8s-build.js +4 -0
- package/k8s-build.js.map +1 -1
- package/libs/Reporter.d.ts +2 -2
- package/libs/Reporter.d.ts.map +1 -1
- package/libs/Reporter.js +5 -5
- package/libs/Reporter.js.map +1 -1
- package/package.json +1 -1
package/k8s-build.js
CHANGED
|
@@ -15,6 +15,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
15
15
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
16
16
|
require("./libs/prototype");
|
|
17
17
|
const commander_1 = require("commander");
|
|
18
|
+
const fs_1 = require("fs");
|
|
18
19
|
const Shell_1 = __importDefault(require("./libs/Shell"));
|
|
19
20
|
const Jira_1 = require("./libs/Jira");
|
|
20
21
|
const Git_1 = __importDefault(require("./libs/Git"));
|
|
@@ -75,6 +76,9 @@ function run(prj, reporter, opts, config) {
|
|
|
75
76
|
const release = opts.changelog ? yield Jira_1.Jira.resolve(prj) : { tasks: [], bugs: [], changelog: '' };
|
|
76
77
|
Shell_1.default.cd(prj.rootPath);
|
|
77
78
|
prj.incrementBuild();
|
|
79
|
+
const pkg = JSON.parse((yield Shell_1.default.cat(prj.rootPath + '/package.json')) || 'no package.json file!');
|
|
80
|
+
pkg.version = prj.version;
|
|
81
|
+
yield fs_1.promises.writeFile(prj.rootPath + '/package.json', JSON.stringify(pkg, null, 3), { encoding: 'utf8', flag: 'w+' });
|
|
78
82
|
yield reporter.startBuild();
|
|
79
83
|
helpers_1.log.info(`1. build ${prj.stage}`);
|
|
80
84
|
yield reporter.append(` + Load apps and check updated`);
|
package/k8s-build.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"k8s-build.js","sourceRoot":"","sources":["../k8s-build.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AACA,4BAA0B;AAE1B,yCAAgD;
|
|
1
|
+
{"version":3,"file":"k8s-build.js","sourceRoot":"","sources":["../k8s-build.ts"],"names":[],"mappings":"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"}
|
package/libs/Reporter.d.ts
CHANGED
|
@@ -4,7 +4,7 @@ import { Project } from './Project';
|
|
|
4
4
|
import { ReleaseInfo } from './Jira';
|
|
5
5
|
export interface ReporterOptions {
|
|
6
6
|
chat_id: number;
|
|
7
|
-
chat_rel?: number
|
|
7
|
+
chat_rel?: Record<string, number>;
|
|
8
8
|
token: string;
|
|
9
9
|
showGroup?: boolean;
|
|
10
10
|
shortVersion?: boolean;
|
|
@@ -17,7 +17,7 @@ export declare class Reporter {
|
|
|
17
17
|
$prj: Project;
|
|
18
18
|
$opt: ReporterOptions;
|
|
19
19
|
$chat_id: number;
|
|
20
|
-
$chat_rel: number
|
|
20
|
+
$chat_rel: Record<string, number>;
|
|
21
21
|
$message_id: number;
|
|
22
22
|
$message_title_prefix: string;
|
|
23
23
|
$message_title_icon: string;
|
package/libs/Reporter.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Reporter.d.ts","sourceRoot":"","sources":["../../libs/Reporter.ts"],"names":[],"mappings":"AAIA,OAAO,aAAa,CAAC;AAErB,OAAO,WAAW,MAAM,uBAAuB,CAAC;AAGhD,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AACpC,OAAO,EAAE,WAAW,EAAE,MAAM,QAAQ,CAAC;AAIrC,MAAM,WAAW,eAAe;IAC/B,OAAO,EAAE,MAAM,CAAC;IAChB,QAAQ,CAAC,EAAE,MAAM,CAAC;
|
|
1
|
+
{"version":3,"file":"Reporter.d.ts","sourceRoot":"","sources":["../../libs/Reporter.ts"],"names":[],"mappings":"AAIA,OAAO,aAAa,CAAC;AAErB,OAAO,WAAW,MAAM,uBAAuB,CAAC;AAGhD,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AACpC,OAAO,EAAE,WAAW,EAAE,MAAM,QAAQ,CAAC;AAIrC,MAAM,WAAW,eAAe;IAC/B,OAAO,EAAE,MAAM,CAAC;IAChB,QAAQ,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAElC,KAAK,EAAE,MAAM,CAAC;IAEd,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB,YAAY,CAAC,EAAE,OAAO,CAAC;IACvB,SAAS,CAAC,EAAE,OAAO,CAAC;IAEpB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,SAAS,CAAC,EAAE,MAAM,CAAC;CACnB;AAID,qBAAa,QAAQ;IAEpB,IAAI,cAAC;IACL,IAAI,EAAE,OAAO,CAAC;IACd,IAAI,EAAE,eAAe,CAAC;IAItB,QAAQ,SAAK;IACb,SAAS,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAM;IAEvC,WAAW,SAAK;IAEhB,qBAAqB,SAAQ;IAC7B,mBAAmB,SAAM;IACzB,sBAAsB,SAAM;IAE5B,aAAa,SAAM;IAEnB,kBAAkB,SAAqB;IAEvC,4BAA4B,SAAM;IAClC,0BAA0B,SAAM;gBAIpB,GAAG,EAAE,OAAO,EAAE,GAAG,EAAE,eAAe;IAiB9C,IAAI,YAAY;;;MAgBf;IAIK,UAAU;IASV,WAAW,CAAC,EAAE,EAAE,MAAM;IAWtB,YAAY,CAAC,EAAE,EAAE,MAAM;IAWvB,IAAI,CAAC,GAAG,EAAE,KAAK;IAaf,OAAO,CAAC,OAAO,GAAE,WAAW,GAAG,SAAqB;IAyBpD,IAAI,CAAC,GAAG,GAAE,MAAW;IAQrB,MAAM,CAAC,IAAI,EAAE,MAAM,EAAE,eAAe,SAAQ;IAwC5C,IAAI,CAAC,OAAO,EAAE,MAAM,EAAE,WAAW,SAAgB;CAkBvD"}
|
package/libs/Reporter.js
CHANGED
|
@@ -21,7 +21,7 @@ const helpers_1 = require("../libs/helpers");
|
|
|
21
21
|
class Reporter {
|
|
22
22
|
constructor(prj, opt) {
|
|
23
23
|
this.$chat_id = 0;
|
|
24
|
-
this.$chat_rel =
|
|
24
|
+
this.$chat_rel = {};
|
|
25
25
|
this.$message_id = 0;
|
|
26
26
|
this.$message_title_prefix = '▶️';
|
|
27
27
|
this.$message_title_icon = '';
|
|
@@ -37,18 +37,17 @@ class Reporter {
|
|
|
37
37
|
if (opt.chat_rel) {
|
|
38
38
|
this.$chat_rel = opt.chat_rel;
|
|
39
39
|
}
|
|
40
|
+
helpers_1.log.dbg(opt);
|
|
40
41
|
}
|
|
41
42
|
get messageParts() {
|
|
42
43
|
let title = `${this.$message_title_prefix} ${this.$message_title_icon} `;
|
|
43
44
|
title += `${this.$prj.group.toUpperCase()} / <b>${this.$prj.name.toUpperCase()} `;
|
|
44
45
|
title += this.$opt.shortVersion ? `v${this.$prj.shortVersion} #${this.$prj.build}` : `v${this.$prj.version}`;
|
|
45
46
|
title += `</b>${this.$message_title_postfix}`;
|
|
46
|
-
const cmpUrl = `${ENV.CI_PROJECT_URL}/-/compare/${this.$message_footer_changes_from}...${this.$message_footer_changes_to}?from_project_id=${this.$prj.id}`;
|
|
47
47
|
const job = this.$prj.job;
|
|
48
48
|
let footer = this.$message_footer_hr + '\n';
|
|
49
49
|
footer += `job: <a href="${job.url}">${job.id}</a> `;
|
|
50
50
|
footer += `by: <a href="${job.commit.url}">${job.user.name}</a> `;
|
|
51
|
-
footer += `diff: <a href="${cmpUrl}">${this.$message_footer_changes_from} - ${this.$message_footer_changes_to}</a> `;
|
|
52
51
|
return { title, footer };
|
|
53
52
|
}
|
|
54
53
|
startBuild() {
|
|
@@ -95,9 +94,10 @@ class Reporter {
|
|
|
95
94
|
msg += `🎉 WHATS NEW in <b>${this.$opt.shortVersion ? `v${this.$prj.shortVersion} #${this.$prj.build}` : `v${this.$prj.version}`}</b>:`;
|
|
96
95
|
msg += htmlEntities(release.changelog);
|
|
97
96
|
yield this.append(msg, ' ');
|
|
98
|
-
|
|
97
|
+
const chat_rel = Number(this.$chat_rel[this.$prj.stage]);
|
|
98
|
+
if (chat_rel && chat_rel !== 0) {
|
|
99
99
|
msg = `${this.$prj.group.toUpperCase()} / <b>${this.$prj.name.toUpperCase()}</b>\n` + msg;
|
|
100
|
-
yield this.send(msg,
|
|
100
|
+
yield this.send(msg, chat_rel);
|
|
101
101
|
}
|
|
102
102
|
});
|
|
103
103
|
}
|
package/libs/Reporter.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Reporter.js","sourceRoot":"","sources":["../../libs/Reporter.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AACA,MAAM,GAAG,GAAG,OAAO,CAAC,GAAG,CAAC;AACxB,GAAG,CAAC,YAAY,GAAC,MAAM,CAAC;AAExB,uBAAqB;AAErB,kFAAgD;AAEhD,6CAAsC;AAsBtC,MAAa,QAAQ;IA0BpB,YAAY,GAAY,EAAE,GAAoB;QAlB9C,aAAQ,GAAG,CAAC,CAAC;QACb,cAAS,
|
|
1
|
+
{"version":3,"file":"Reporter.js","sourceRoot":"","sources":["../../libs/Reporter.ts"],"names":[],"mappings":"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"}
|