@clickview/ship-it 0.0.4-dev.0 → 0.0.4-dev.2
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.
|
@@ -79,35 +79,33 @@ var ReleaseCommand = /** @class */ (function () {
|
|
|
79
79
|
cont = _a.sent();
|
|
80
80
|
if (!cont)
|
|
81
81
|
return [2 /*return*/, false];
|
|
82
|
-
|
|
83
|
-
case 3:
|
|
84
|
-
cont = _a.sent();
|
|
82
|
+
// cont = await this.validateDescriptionsTask.run(options);
|
|
85
83
|
if (!cont)
|
|
86
84
|
return [2 /*return*/, false];
|
|
87
85
|
return [4 /*yield*/, this.validateCommitsTask.run(options)];
|
|
88
|
-
case
|
|
86
|
+
case 3:
|
|
89
87
|
cont = _a.sent();
|
|
90
88
|
if (!cont)
|
|
91
89
|
return [2 /*return*/, false];
|
|
92
90
|
return [4 /*yield*/, this.createBranchTask.run(options)];
|
|
93
|
-
case
|
|
91
|
+
case 4:
|
|
94
92
|
cont = _a.sent();
|
|
95
93
|
if (!cont)
|
|
96
94
|
return [2 /*return*/, false];
|
|
97
95
|
return [4 /*yield*/, this.bumpVersionTxtTask.run(options)];
|
|
98
|
-
case
|
|
96
|
+
case 5:
|
|
99
97
|
cont = _a.sent();
|
|
100
98
|
if (!cont)
|
|
101
99
|
return [2 /*return*/, false];
|
|
102
100
|
return [4 /*yield*/, this.createMergeRequestTask.run(options)];
|
|
103
|
-
case
|
|
101
|
+
case 6:
|
|
104
102
|
cont = _a.sent();
|
|
105
103
|
if (!cont)
|
|
106
104
|
return [2 /*return*/, false];
|
|
107
105
|
if (!options.triggerMonorepoBuild)
|
|
108
106
|
return [2 /*return*/, false];
|
|
109
107
|
return [4 /*yield*/, this.startMonorepoBuildTask.run(options)];
|
|
110
|
-
case
|
|
108
|
+
case 7: return [2 /*return*/, _a.sent()];
|
|
111
109
|
}
|
|
112
110
|
});
|
|
113
111
|
});
|
|
@@ -86,7 +86,7 @@ var ValidateTask = /** @class */ (function () {
|
|
|
86
86
|
utils_1.Logger.logMessage("Found ".concat(projects.length, " projects that need to be released"));
|
|
87
87
|
cont = true;
|
|
88
88
|
_loop_1 = function (project) {
|
|
89
|
-
var groupedMRs = lodash_1.default.groupBy(project.mergeRequests, function (mr) { return mr.status; });
|
|
89
|
+
var groupedMRs = lodash_1.default.groupBy(project.mergeRequests.filter(function (mr) { return mr.targetBranch !== 'master'; }), function (mr) { return mr.status; });
|
|
90
90
|
var count = Object.keys(groupedMRs).reduce(function (prev, current) {
|
|
91
91
|
var _a;
|
|
92
92
|
return __assign(__assign({}, prev), (_a = {}, _a[current] = groupedMRs[current].length, _a));
|
|
@@ -132,7 +132,7 @@ var ValidateTask = /** @class */ (function () {
|
|
|
132
132
|
var allNonDevMrs = [];
|
|
133
133
|
for (var _i = 0, projects_2 = projects; _i < projects_2.length; _i++) {
|
|
134
134
|
var project = projects_2[_i];
|
|
135
|
-
var notReadyMrs = project.mergeRequests.filter(function (mr) { return mr.status === 'opened'; });
|
|
135
|
+
var notReadyMrs = project.mergeRequests.filter(function (mr) { return mr.status === 'opened' && mr.targetBranch !== 'master'; });
|
|
136
136
|
var nonDevMrs = project.mergeRequests.filter(function (mr) { return mr.targetBranch !== 'dev' && mr.targetBranch !== 'master'; });
|
|
137
137
|
if (notReadyMrs.length)
|
|
138
138
|
allNotReadyMrs.push.apply(allNotReadyMrs, notReadyMrs);
|