@clickview/ship-it 0.0.30 → 0.0.31
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/config.json +1 -1
- package/lib/config.json +1 -1
- package/lib/src/tasks/TagMasterTask.js +4 -3
- package/package.json +1 -1
package/config.json
CHANGED
package/lib/config.json
CHANGED
|
@@ -106,7 +106,7 @@ var TagMasterTask = /** @class */ (function () {
|
|
|
106
106
|
_c.sent();
|
|
107
107
|
Logger_1.Logger.logWarning("[".concat(project.title, "]: [").concat(nextVersion, "] was created"));
|
|
108
108
|
_b = logMessageSlack;
|
|
109
|
-
return [4 /*yield*/, this.mergeMasterToDev(project, options.milestone
|
|
109
|
+
return [4 /*yield*/, this.mergeMasterToDev(project, options.milestone)];
|
|
110
110
|
case 7:
|
|
111
111
|
logMessageSlack = _b + _c.sent();
|
|
112
112
|
_c.label = 8;
|
|
@@ -131,12 +131,13 @@ var TagMasterTask = /** @class */ (function () {
|
|
|
131
131
|
});
|
|
132
132
|
});
|
|
133
133
|
};
|
|
134
|
-
TagMasterTask.prototype.mergeMasterToDev = function (project, milestone
|
|
134
|
+
TagMasterTask.prototype.mergeMasterToDev = function (project, milestone) {
|
|
135
135
|
return __awaiter(this, void 0, void 0, function () {
|
|
136
|
-
var delay, mergeRequest, updatedMergeRequest, acceptMr;
|
|
136
|
+
var logMessageSlack, delay, mergeRequest, updatedMergeRequest, acceptMr;
|
|
137
137
|
return __generator(this, function (_a) {
|
|
138
138
|
switch (_a.label) {
|
|
139
139
|
case 0:
|
|
140
|
+
logMessageSlack = '';
|
|
140
141
|
delay = (0, util_1.promisify)(setTimeout);
|
|
141
142
|
return [4 /*yield*/, this.service.createMergeRequest(project.id, 'master', 'dev', "Merge ".concat(milestone, " master into dev"), 'Merging master into dev', milestone)];
|
|
142
143
|
case 1:
|