@clickview/ship-it 0.0.4-dev.4 → 0.0.4-rc.0

package/config.json

@@ -2,10 +2,5 @@
   "gitLab": {
     "accessToken": "glpat-YK8GmVgXRRf3zBe3JQze",
     "url": "https://gitlab.cvinternal.net"
-  },
-  "teamCity": {
-    "url": "http://build.cvinternal.net/",
-    "username": "shale.kuzmanovski",
-    "password": "final2&ergot"
   }
 }

package/lib/config.json

@@ -2,10 +2,5 @@
     "gitLab": {
         "accessToken": "glpat-YK8GmVgXRRf3zBe3JQze",
         "url": "https://gitlab.cvinternal.net"
-    },
-    "teamCity": {
-        "url": "http://build.cvinternal.net/",
-        "username": "shale.kuzmanovski",
-        "password": "final2&ergot"
     }
 }

package/lib/src/api-clients/git-lab/GitLabApiClient.js

@@ -228,30 +228,6 @@ var GitLabApiClient = /** @class */ (function () {
             });
         });
     };
-    GitLabApiClient.prototype.getReleaseMergeRequest = function (projectId, milestone) {
-        return __awaiter(this, void 0, void 0, function () {
-            var mergeRequests, releaseMR;
-            return __generator(this, function (_a) {
-                switch (_a.label) {
-                    case 0: return [4 /*yield*/, this.client.MergeRequests.all({
-                            projectId: projectId,
-                            targetBranch: 'master',
-                            /**
-                             * We only care about open MRs, this allows us to close any MR and run the CLI again if needed
-                             */
-                            state: 'opened',
-                            milestone: milestone
-                        })];
-                    case 1:
-                        mergeRequests = _a.sent();
-                        releaseMR = mergeRequests[0];
-                        if (!releaseMR)
-                            return [2 /*return*/, null];
-                        return [2 /*return*/, GitLabMapper_1.GitLabMapper.mergeRequest(releaseMR)];
-                }
-            });
-        });
-    };
     GitLabApiClient.prototype.createMergeRequest = function (projectId, sourceBranch, targetBranch, title, description, milestone) {
         return __awaiter(this, void 0, void 0, function () {
             var mergeRequest;

package/lib/src/api-clients/git-lab/GitLabMapper.js

@@ -15,7 +15,6 @@ exports.GitLabMapper = {
             url: m.web_url,
             hasConflicts: m.has_conflicts,
             targetBranch: m.target_branch,
-            sourceBranch: m.source_branch,
             milestone: exports.GitLabMapper.milestone(m.milestone)
         };
     },

package/lib/src/api-clients/index.js

@@ -15,4 +15,3 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 __exportStar(require("./git-lab/GitLabApiClient"), exports);
-__exportStar(require("./team-city/TeamCityApiClient"), exports);

package/lib/src/commands/ReleaseCommand.js

@@ -53,7 +53,7 @@ require("reflect-metadata");
 var inversify_1 = require("inversify");
 var types_1 = require("../types");
 var ReleaseCommand = /** @class */ (function () {
-    function ReleaseCommand(validateTask, versionTask, validateDescriptionsTask, validateCommitsTask, createBranchTask, bumpVersionTxtTask, createMergeRequestTask, startMonorepoBuildTask) {
+    function ReleaseCommand(validateTask, versionTask, validateDescriptionsTask, validateCommitsTask, createBranchTask, bumpVersionTxtTask, createMergeRequestTask) {
         this.validateTask = validateTask;
         this.versionTask = versionTask;
         this.validateDescriptionsTask = validateDescriptionsTask;
@@ -61,7 +61,6 @@ var ReleaseCommand = /** @class */ (function () {
         this.createBranchTask = createBranchTask;
         this.bumpVersionTxtTask = bumpVersionTxtTask;
         this.createMergeRequestTask = createMergeRequestTask;
-        this.startMonorepoBuildTask = startMonorepoBuildTask;
     }
     ReleaseCommand.prototype.run = function (options) {
         return __awaiter(this, void 0, void 0, function () {
@@ -79,31 +78,28 @@ var ReleaseCommand = /** @class */ (function () {
                         cont = _a.sent();
                         if (!cont)
                             return [2 /*return*/, false];
-                        // cont = await this.validateDescriptionsTask.run(options);
-                        if (!cont)
-                            return [2 /*return*/, false];
-                        // cont = await this.validateCommitsTask.run(options);
-                        if (!cont)
-                            return [2 /*return*/, false];
-                        return [4 /*yield*/, this.createBranchTask.run(options)];
+                        return [4 /*yield*/, this.validateDescriptionsTask.run(options)];
                     case 3:
                         cont = _a.sent();
                         if (!cont)
                             return [2 /*return*/, false];
-                        return [4 /*yield*/, this.bumpVersionTxtTask.run(options)];
+                        return [4 /*yield*/, this.validateCommitsTask.run(options)];
                     case 4:
                         cont = _a.sent();
                         if (!cont)
                             return [2 /*return*/, false];
-                        return [4 /*yield*/, this.createMergeRequestTask.run(options)];
+                        return [4 /*yield*/, this.createBranchTask.run(options)];
                     case 5:
                         cont = _a.sent();
                         if (!cont)
                             return [2 /*return*/, false];
-                        if (!options.triggerMonorepoBuild)
+                        return [4 /*yield*/, this.bumpVersionTxtTask.run(options)];
+                    case 6:
+                        cont = _a.sent();
+                        if (!cont)
                             return [2 /*return*/, false];
-                        return [4 /*yield*/, this.startMonorepoBuildTask.run(options)];
-                    case 6: return [2 /*return*/, _a.sent()];
+                        return [4 /*yield*/, this.createMergeRequestTask.run(options)];
+                    case 7: return [2 /*return*/, _a.sent()];
                 }
             });
         });
@@ -117,8 +113,7 @@ var ReleaseCommand = /** @class */ (function () {
         __param(4, (0, inversify_1.inject)(types_1.TASKS.CreateBranchTask)),
         __param(5, (0, inversify_1.inject)(types_1.TASKS.BumpVersionTxtTask)),
         __param(6, (0, inversify_1.inject)(types_1.TASKS.CreateMergeRequestTask)),
-        __param(7, (0, inversify_1.inject)(types_1.TASKS.StartMonorepoBuildTask)),
-        __metadata("design:paramtypes", [Object, Object, Object, Object, Object, Object, Object, Object])
+        __metadata("design:paramtypes", [Object, Object, Object, Object, Object, Object, Object])
     ], ReleaseCommand);
     return ReleaseCommand;
 }());

package/lib/src/commands/index.js

@@ -20,7 +20,6 @@ __exportStar(require("./CreateMergeRequestCommand"), exports);
 __exportStar(require("./CreateReleaseNotesCommand"), exports);
 __exportStar(require("./InstallPackagesCommand"), exports);
 __exportStar(require("./ReleaseCommand"), exports);
-__exportStar(require("./StartConsumingProjectBuildsCommand"), exports);
 __exportStar(require("./StatusCommand"), exports);
 __exportStar(require("./ValidateMergeRequestCommand"), exports);
 __exportStar(require("./VersionCommand"), exports);

package/lib/src/constants/CommandTypeMapping.js

@@ -11,6 +11,5 @@ exports.CommandTypeMapping = {
     'create-notes': types_1.COMMANDS.CreateReleaseNotesCommand,
     'install-packages': types_1.COMMANDS.InstallPackagesCommand,
     'bump-packages': types_1.COMMANDS.BumpPackagesCommand,
-    'start-consuming-project-builds': types_1.COMMANDS.StartConsumingProjectBuildsCommand,
     'validate-mr': types_1.COMMANDS.ValidateMergeRequestCommand
 };

package/lib/src/interfaces/command-options/index.js

@@ -15,7 +15,6 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 __exportStar(require("./BumpPackagesCommandOptions"), exports);
-__exportStar(require("./DockerMilestoneCommandOptions"), exports);
+__exportStar(require("./InstallPackagesCommandOptions"), exports);
 __exportStar(require("./MilestoneCommandOptions"), exports);
 __exportStar(require("./ValidateMRCommandOptions"), exports);
-__exportStar(require("./ReleaseCommandOptions"), exports);

package/lib/src/interfaces/index.js

@@ -14,7 +14,6 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
     for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-__exportStar(require("./command-cli-options"), exports);
 __exportStar(require("./command-options"), exports);
 __exportStar(require("./models"), exports);
 __exportStar(require("./view-models"), exports);

package/lib/src/inversify.config.js

@@ -13,17 +13,14 @@ function createContainer(config) {
      * Misc
      */
     container.bind(types_1.MISC.GitLabConfig).toConstantValue(config.gitLab);
-    container.bind(types_1.MISC.TeamCityConfig).toConstantValue(config.teamCity);
     /**
      * Clients
      */
     container.bind(types_1.API_CLIENTS.GitLabApiClient).to(api_clients_1.GitLabApiClient);
-    container.bind(types_1.API_CLIENTS.TeamCityApiClient).to(api_clients_1.TeamCityApiClient);
     /**
      * Services
      */
     container.bind(types_1.SERVICES.GitLabService).to(services_1.GitLabService).inSingletonScope();
-    container.bind(types_1.SERVICES.TeamCityService).to(services_1.TeamCityService).inSingletonScope();
     /**
      * Tasks
      */
@@ -39,9 +36,6 @@ function createContainer(config) {
     container.bind(types_1.TASKS.BumpPackagesTask).to(tasks_1.BumpPackagesTask);
     container.bind(types_1.TASKS.CommitPackageVersionsTask).to(tasks_1.CommitPackageVersionsTask);
     container.bind(types_1.TASKS.ValidateMergeRequestTask).to(tasks_1.ValidateMergeRequestTask);
-    container.bind(types_1.TASKS.StartMonorepoBuildTask).to(tasks_1.StartMonorepoBuildTask);
-    container.bind(types_1.TASKS.StartConsumingProjectBuildsTask)
-        .to(tasks_1.StartConsumingProjectBuildsTask);
     /**
      * Commands
      */
@@ -54,8 +48,6 @@ function createContainer(config) {
     container.bind(types_1.COMMANDS.InstallPackagesCommand).to(commands_1.InstallPackagesCommand);
     container.bind(types_1.COMMANDS.BumpPackagesCommand).to(commands_1.BumpPackagesCommand);
     container.bind(types_1.COMMANDS.ValidateMergeRequestCommand).to(commands_1.ValidateMergeRequestCommand);
-    container.bind(types_1.COMMANDS.StartConsumingProjectBuildsCommand)
-        .to(commands_1.StartConsumingProjectBuildsCommand);
     return container;
 }
 exports.createContainer = createContainer;

package/lib/src/services/GitLabService.js

@@ -202,39 +202,6 @@ var GitLabService = /** @class */ (function () {
     GitLabService.prototype.getMilestone = function (projectId, milestoneName) {
         return this.apiClient.getMilestone(projectId, milestoneName);
     };
-    GitLabService.prototype.getReleaseBranchNameMilestone = function (projectId, milestone) {
-        return __awaiter(this, void 0, void 0, function () {
-            var releaseMR;
-            return __generator(this, function (_a) {
-                switch (_a.label) {
-                    case 0: return [4 /*yield*/, this.apiClient.getReleaseMergeRequest(projectId, milestone)];
-                    case 1:
-                        releaseMR = _a.sent();
-                        if (!releaseMR)
-                            return [2 /*return*/, null];
-                        return [2 /*return*/, releaseMR.sourceBranch];
-                }
-            });
-        });
-    };
-    GitLabService.prototype.getMilestoneByBranchName = function (projectId, branchName) {
-        var _a, _b;
-        return __awaiter(this, void 0, void 0, function () {
-            var mergeRequest;
-            return __generator(this, function (_c) {
-                switch (_c.label) {
-                    case 0: return [4 /*yield*/, this.getMergeRequest(projectId, branchName)];
-                    case 1:
-                        mergeRequest = _c.sent();
-                        if (!mergeRequest)
-                            throw new errors_1.ShipItError("No merge request in project \"monorepo\" with branch name \"".concat(branchName, "\" could be found."));
-                        if (!mergeRequest.milestone)
-                            throw new errors_1.ShipItError("No milestone could be found on merge request \"".concat(mergeRequest.title, "\". Please attach a milestone then try again: ").concat(mergeRequest.url));
-                        return [2 /*return*/, (_b = (_a = mergeRequest.milestone) === null || _a === void 0 ? void 0 : _a.name) !== null && _b !== void 0 ? _b : ''];
-                }
-            });
-        });
-    };
     GitLabService.prototype.bumpVersionTxt = function (projectId, branchName, newVersion) {
         return __awaiter(this, void 0, void 0, function () {
             var versionTxt, buff, text;

package/lib/src/services/index.js

@@ -15,4 +15,3 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 __exportStar(require("./GitLabService"), exports);
-__exportStar(require("./TeamCityService"), exports);

package/lib/src/startup/AddMilestoneCommand.js

@@ -36,7 +36,7 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
     }
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.processMilestoneCommandOptions = exports.getAddMilestoneCommand = void 0;
+exports.getAddMilestoneCommand = void 0;
 var utils_1 = require("../utils");
 function processOptions(options) {
     var opts = {
@@ -53,7 +53,6 @@ function processOptions(options) {
         opts.version = 'patch';
     return opts;
 }
-exports.processMilestoneCommandOptions = processOptions;
 var getAddMilestoneCommand = function (program, getAction) {
     return function addMilestoneCommand(name, description) {
         var _this = this;

package/lib/src/startup/SetupCommands.js

@@ -1,62 +1,9 @@
 "use strict";
-var __assign = (this && this.__assign) || function () {
-    __assign = Object.assign || function(t) {
-        for (var s, i = 1, n = arguments.length; i < n; i++) {
-            s = arguments[i];
-            for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
-                t[p] = s[p];
-        }
-        return t;
-    };
-    return __assign.apply(this, arguments);
-};
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
-var __generator = (this && this.__generator) || function (thisArg, body) {
-    var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g;
-    return g = { next: verb(0), "throw": verb(1), "return": verb(2) }, typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
-    function verb(n) { return function (v) { return step([n, v]); }; }
-    function step(op) {
-        if (f) throw new TypeError("Generator is already executing.");
-        while (_) try {
-            if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
-            if (y = 0, t) op = [op[0] & 2, t.value];
-            switch (op[0]) {
-                case 0: case 1: t = op; break;
-                case 4: _.label++; return { value: op[1], done: false };
-                case 5: _.label++; y = op[1]; op = [0]; continue;
-                case 7: op = _.ops.pop(); _.trys.pop(); continue;
-                default:
-                    if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; }
-                    if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; }
-                    if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; }
-                    if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; }
-                    if (t[2]) _.ops.pop();
-                    _.trys.pop(); continue;
-            }
-            op = body.call(thisArg, _);
-        } catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; }
-        if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
-    }
-};
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.setupCommands = void 0;
-var lodash_1 = __importDefault(require("lodash"));
-var CommandTypeMapping_1 = require("../constants/CommandTypeMapping");
 var AddMilestoneCommand_1 = require("./AddMilestoneCommand");
 var GetAction_1 = require("./GetAction");
 function setupCommands(program, container) {
-    var _this = this;
     var getAction = (0, GetAction_1.getActionBuilder)(program, container);
     var addMilestoneCommand = (0, AddMilestoneCommand_1.getAddMilestoneCommand)(program, getAction);
     // All commands below accept the same options
@@ -65,23 +12,7 @@ function setupCommands(program, container) {
     addMilestoneCommand('create-branches', 'Create release branches for all projects that are part of a milestone');
     addMilestoneCommand('create-mrs', 'Create merge requests for all projects that are part of a milestone');
     addMilestoneCommand('create-notes', 'Builds descriptions for all projects that are part of a milestone');
-    program.command('release')
-        .description('Create releases for all projects that are part of a milestone')
-        .requiredOption('-m, --milestone <milestone>')
-        .option('-p, --projectIds <projectIds...>')
-        .option('--hotfix')
-        .option('--major')
-        .option('--trigger-monorepo-build')
-        .action(function (options) { return __awaiter(_this, void 0, void 0, function () {
-        var milestoneCommandOptions, releaseCommandOptions;
-        return __generator(this, function (_a) {
-            milestoneCommandOptions = (0, AddMilestoneCommand_1.processMilestoneCommandOptions)(lodash_1.default.omit(options, 'triggerMonorepoBuild'));
-            releaseCommandOptions = __assign(__assign({}, milestoneCommandOptions), { triggerMonorepoBuild: !!options.triggerMonorepoBuild });
-            container.get(CommandTypeMapping_1.CommandTypeMapping['release'])
-                .run(releaseCommandOptions);
-            return [2 /*return*/];
-        });
-    }); });
+    addMilestoneCommand('release', 'Create releases for all projects that are part of a milestone');
     program.command('bump-packages')
         .description('Bump clickview npm package versions in monorepo to their next version')
         .requiredOption('-b, --branchName <branchName>')
@@ -90,21 +21,9 @@ function setupCommands(program, container) {
     program.command('install-packages')
         .description('Install the latest clickview npm packages in all consuming projects that are part of a milestone')
         .option('-m, --milestone <milestone>')
-        .option('-b, --branchName <monorepoBranchName>')
+        .option('-b, --branchName <branchName>')
         .option('-p, --projectIds <projectIds...>')
         .action(getAction('install-packages'));
-    program.command('start-consuming-project-builds')
-        .description('Trigger TeamCity builds in all consuming projects that are a part of a milestone')
-        .option('-m, --milestone <milestone>')
-        .option('--monorepoBranchName <monorepoBranchName>')
-        .option('-p, --projectIds <projectIds...>')
-        .action(function (options) { return __awaiter(_this, void 0, void 0, function () {
-        return __generator(this, function (_a) {
-            container.get(CommandTypeMapping_1.CommandTypeMapping['start-consuming-project-builds'])
-                .run(options);
-            return [2 /*return*/];
-        });
-    }); });
     program.command('validate-mr')
         .description('Validate a merge request in a single project, ensuring it has a milestone and valid description')
         .option('-p, --projectId <projectId>')

package/lib/src/tasks/BumpPackagesTask.js

@@ -89,12 +89,11 @@ var BumpPackagesTask = /** @class */ (function () {
                         return [4 /*yield*/, this.getLernaCommand(options)];
                     case 2:
                         lernaVersionCmd = _a.sent();
-                        console.log("Found lerna command ".concat(lernaVersionCmd, " but running dev versioning script for testing purposes"));
                         if (!lernaVersionCmd) {
                             utils_1.Logger.logError('Something went wrong while trying to detect which versioning script to run with Lerna.');
                             return [2 /*return*/, false];
                         }
-                        (0, child_process_1.execSync)("lerna version prepatch --preid dev ".concat(SHARED_LERNA_OPTIONS));
+                        (0, child_process_1.execSync)(lernaVersionCmd);
                         utils_1.Logger.logSuccess('Successfully executed Lerna versioning command.');
                         return [2 /*return*/, true];
                 }

package/lib/src/tasks/CreateBranchTask.js

@@ -60,54 +60,36 @@ var CreateBranchTask = /** @class */ (function () {
     }
     CreateBranchTask.prototype.run = function (options) {
         return __awaiter(this, void 0, void 0, function () {
-            var projects, _loop_1, this_1, _i, projects_1, project;
-            return __generator(this, function (_a) {
-                switch (_a.label) {
+            var projects, _i, projects_1, project, _a, branch, branchName, branchFrom;
+            return __generator(this, function (_b) {
+                switch (_b.label) {
                     case 0:
                         utils_1.Logger.logTask('Creating release branches');
                         return [4 /*yield*/, this.service.getProjects(options)];
                     case 1:
-                        projects = _a.sent();
-                        _loop_1 = function (project) {
-                            var _b, branch, branchName, branchFrom;
-                            return __generator(this, function (_c) {
-                                switch (_c.label) {
-                                    case 0: return [4 /*yield*/, this_1.service.getNextBranchInfo(project.id, options.version)];
-                                    case 1:
-                                        _b = _c.sent(), branch = _b.branch, branchName = _b.branchName;
-                                        if (branch) {
-                                            utils_1.Logger.logWarning("[".concat(project.title, "]: [").concat(branchName, "] Already exists"));
-                                            return [2 /*return*/, "continue"];
-                                        }
-                                        branchFrom = (function () {
-                                            if (project.id.toString() === utils_1.ProjectIds.MONOREPO_PROJECT_ID)
-                                                return 'docker';
-                                            return options.version === 'patch' ? 'master' : 'dev';
-                                        })();
-                                        // const branchFrom = options.version === 'patch' ? 'master' : 'dev';
-                                        return [4 /*yield*/, this_1.service.createBranch(project, branchFrom, branchName, false)];
-                                    case 2:
-                                        // const branchFrom = options.version === 'patch' ? 'master' : 'dev';
-                                        _c.sent();
-                                        utils_1.Logger.logMessage("[".concat(project.title, "]: [").concat(branchName, "] Has been created"));
-                                        return [2 /*return*/];
-                                }
-                            });
-                        };
-                        this_1 = this;
+                        projects = _b.sent();
                         _i = 0, projects_1 = projects;
-                        _a.label = 2;
+                        _b.label = 2;
                     case 2:
-                        if (!(_i < projects_1.length)) return [3 /*break*/, 5];
+                        if (!(_i < projects_1.length)) return [3 /*break*/, 6];
                         project = projects_1[_i];
-                        return [5 /*yield**/, _loop_1(project)];
+                        return [4 /*yield*/, this.service.getNextBranchInfo(project.id, options.version)];
                     case 3:
-                        _a.sent();
-                        _a.label = 4;
+                        _a = _b.sent(), branch = _a.branch, branchName = _a.branchName;
+                        if (branch) {
+                            utils_1.Logger.logWarning("[".concat(project.title, "]: [").concat(branchName, "] Already exists"));
+                            return [3 /*break*/, 5];
+                        }
+                        branchFrom = options.version === 'patch' ? 'master' : 'dev';
+                        return [4 /*yield*/, this.service.createBranch(project, branchFrom, branchName, false)];
                     case 4:
+                        _b.sent();
+                        utils_1.Logger.logMessage("[".concat(project.title, "]: [").concat(branchName, "] Has been created"));
+                        _b.label = 5;
+                    case 5:
                         _i++;
                         return [3 /*break*/, 2];
-                    case 5: return [2 /*return*/, true];
+                    case 6: return [2 /*return*/, true];
                 }
             });
         });

package/lib/src/tasks/InstallPackagesTask.js

@@ -84,28 +84,18 @@ var InstallPackagesTask = /** @class */ (function () {
                 switch (_c.label) {
                     case 0:
                         utils_1.Logger.logTask('Installing npm packages');
-                        if (!_options.monorepoBranchName && !_options.milestone) {
-                            utils_1.Logger.logError('Please provide either a milestone or branch name argument.');
-                            return [2 /*return*/, false];
-                        }
-                        milestone = _options.milestone;
-                        if (!!milestone) return [3 /*break*/, 2];
-                        utils_1.Logger.logInfo("Searching for a merge request in project \"monorepo\" with branch name \"".concat(_options.monorepoBranchName, "\"..."));
-                        return [4 /*yield*/, this.service.getMilestoneByBranchName(utils_1.ProjectIds.MONOREPO_PROJECT_ID, _options.monorepoBranchName)];
+                        return [4 /*yield*/, this.getMilestone(_options)];
                     case 1:
                         milestone = _c.sent();
-                        _c.label = 2;
-                    case 2:
                         if (!milestone)
                             return [2 /*return*/, false];
-                        utils_1.Logger.logInfo("Found milestone \"".concat(milestone, "\". Proceeding to install packages in consuming projects..."));
                         options = {
                             version: _options.version,
                             projectIds: _options.projectIds,
                             milestone: milestone
                         };
                         return [4 /*yield*/, this.service.getProjects(options)];
-                    case 3:
+                    case 2:
                         projects = _c.sent();
                         monorepo = projects.find(function (p) { return p.id.toString() === utils_1.ProjectIds.MONOREPO_PROJECT_ID; });
                         consumingProjects = projects.filter(function (p) { return p.id.toString() !== utils_1.ProjectIds.MONOREPO_PROJECT_ID; });
@@ -118,14 +108,14 @@ var InstallPackagesTask = /** @class */ (function () {
                             return [2 /*return*/, false];
                         }
                         return [4 /*yield*/, this.service.getNextBranchInfo(monorepo.id, options.version)];
-                    case 4:
+                    case 3:
                         _a = _c.sent(), monorepoBranch = _a.branch, monorepoBranchName = _a.branchName;
                         if (!monorepoBranch) {
                             utils_1.Logger.logError("[".concat(monorepo.title, "]: [").concat(monorepoBranchName, "] branch does not exist"));
                             return [2 /*return*/, false];
                         }
                         return [4 /*yield*/, this.getPackageVersions(monorepoBranchName)];
-                    case 5:
+                    case 4:
                         versions = _c.sent();
                         utils_1.Logger.logMessage("Versions identified for ".concat(monorepoBranchName));
                         Object.keys(versions).forEach(function (key) {
@@ -133,26 +123,26 @@ var InstallPackagesTask = /** @class */ (function () {
                         });
                         utils_1.Logger.logMessage('\nInstalling packages:\n');
                         _i = 0, consumingProjects_1 = consumingProjects;
-                        _c.label = 6;
-                    case 6:
-                        if (!(_i < consumingProjects_1.length)) return [3 /*break*/, 11];
+                        _c.label = 5;
+                    case 5:
+                        if (!(_i < consumingProjects_1.length)) return [3 /*break*/, 10];
                         project = consumingProjects_1[_i];
                         return [4 /*yield*/, this.service.getNextBranchInfo(project.id, options.version)];
-                    case 7:
+                    case 6:
                         _b = _c.sent(), branch = _b.branch, branchName = _b.branchName;
                         if (!branch) {
                             utils_1.Logger.logError("[".concat(project.title, "]: [").concat(branchName, "] does not exist"));
-                            return [3 /*break*/, 10];
+                            return [3 /*break*/, 9];
                         }
                         return [4 /*yield*/, this.updateAndSavePackageFiles(project, options.milestone, branchName, versions)];
-                    case 8:
+                    case 7:
                         hasUpdates = _c.sent();
                         /**
                          * If there are no changes to the versions, we're done here
                          */
                         if (!hasUpdates) {
                             utils_1.Logger.logWarning("[".concat(project.title, "]: [").concat(branchName, "] does not require any updates"));
-                            return [3 /*break*/, 10];
+                            return [3 /*break*/, 9];
                         }
                         /**
                          * Run npm i to update our package log file
@@ -164,17 +154,48 @@ var InstallPackagesTask = /** @class */ (function () {
                          * Commit our updated package.json and package-lock.json
                          */
                         return [4 /*yield*/, this.commitUpdatedFiles(project, options.milestone, branchName)];
-                    case 9:
+                    case 8:
                         /**
                          * Commit our updated package.json and package-lock.json
                          */
                         _c.sent();
                         utils_1.Logger.logMessage("[".concat(project.title, "]: File changes committed"));
-                        _c.label = 10;
-                    case 10:
+                        _c.label = 9;
+                    case 9:
                         _i++;
-                        return [3 /*break*/, 6];
-                    case 11: return [2 /*return*/, true];
+                        return [3 /*break*/, 5];
+                    case 10: return [2 /*return*/, true];
+                }
+            });
+        });
+    };
+    InstallPackagesTask.prototype.getMilestone = function (options) {
+        var _a, _b;
+        return __awaiter(this, void 0, void 0, function () {
+            var mergeRequest;
+            return __generator(this, function (_c) {
+                switch (_c.label) {
+                    case 0:
+                        if (options.milestone)
+                            return [2 /*return*/, options.milestone];
+                        if (!options.branchName) {
+                            utils_1.Logger.logError('Please provide either a milestone or branch name argument.');
+                            return [2 /*return*/, ''];
+                        }
+                        utils_1.Logger.logInfo("Searching for a merge request in project \"monorepo\" with branch name \"".concat(options.branchName, "\"..."));
+                        return [4 /*yield*/, this.service.getMergeRequest(utils_1.ProjectIds.MONOREPO_PROJECT_ID, options.branchName)];
+                    case 1:
+                        mergeRequest = _c.sent();
+                        if (!mergeRequest) {
+                            utils_1.Logger.logError("No merge request in project \"monorepo\" with branch name \"".concat(options.branchName, "\" could be found."));
+                            return [2 /*return*/, ''];
+                        }
+                        if (!mergeRequest.milestone) {
+                            utils_1.Logger.logError("No milestone could be found on merge request \"".concat(mergeRequest.title, "\". Please attach a milestone then try again: ").concat(mergeRequest.url));
+                            return [2 /*return*/, ''];
+                        }
+                        utils_1.Logger.logInfo("Found milestone \"".concat(mergeRequest.milestone.name, "\". Proceeding to install packages in consuming projects..."));
+                        return [2 /*return*/, (_b = (_a = mergeRequest.milestone) === null || _a === void 0 ? void 0 : _a.name) !== null && _b !== void 0 ? _b : ''];
                 }
             });
         });

package/lib/src/tasks/ValidateTask.js

@@ -86,7 +86,7 @@ var ValidateTask = /** @class */ (function () {
                         utils_1.Logger.logMessage("Found ".concat(projects.length, " projects that need to be released"));
                         cont = true;
                         _loop_1 = function (project) {
-                            var groupedMRs = lodash_1.default.groupBy(project.mergeRequests.filter(function (mr) { return mr.targetBranch !== 'master'; }), function (mr) { return mr.status; });
+                            var groupedMRs = lodash_1.default.groupBy(project.mergeRequests, function (mr) { return mr.status; });
                             var count = Object.keys(groupedMRs).reduce(function (prev, current) {
                                 var _a;
                                 return __assign(__assign({}, prev), (_a = {}, _a[current] = groupedMRs[current].length, _a));
@@ -132,7 +132,7 @@ var ValidateTask = /** @class */ (function () {
         var allNonDevMrs = [];
         for (var _i = 0, projects_2 = projects; _i < projects_2.length; _i++) {
             var project = projects_2[_i];
-            var notReadyMrs = project.mergeRequests.filter(function (mr) { return mr.status === 'opened' && mr.targetBranch !== 'master'; });
+            var notReadyMrs = project.mergeRequests.filter(function (mr) { return mr.status === 'opened'; });
             var nonDevMrs = project.mergeRequests.filter(function (mr) { return mr.targetBranch !== 'dev' && mr.targetBranch !== 'master'; });
             if (notReadyMrs.length)
                 allNotReadyMrs.push.apply(allNotReadyMrs, notReadyMrs);